diff options
| author | Steve Block <steveblock@google.com> | 2009-10-09 13:27:03 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2009-10-20 00:41:59 +0100 |
| commit | 3f252f84468859d129a8c6a9302412d2e6e5a3fa (patch) | |
| tree | 109b326a088d13e83fd53b4bace151f800647c1a /WebCore/loader/FrameLoaderClient.h | |
| parent | 231d4e3152a9c27a73b6ac7badbe6be673aa3ddf (diff) | |
| download | external_webkit-3f252f84468859d129a8c6a9302412d2e6e5a3fa.zip external_webkit-3f252f84468859d129a8c6a9302412d2e6e5a3fa.tar.gz external_webkit-3f252f84468859d129a8c6a9302412d2e6e5a3fa.tar.bz2 | |
Merge webkit.org at R49305 : Fix merge conflicts.
Change-Id: I9e0ffbe9b9b824399653da038093874e315ccd6a
Diffstat (limited to 'WebCore/loader/FrameLoaderClient.h')
| -rw-r--r-- | WebCore/loader/FrameLoaderClient.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/WebCore/loader/FrameLoaderClient.h b/WebCore/loader/FrameLoaderClient.h index 7973ca5..a20bd43 100644 --- a/WebCore/loader/FrameLoaderClient.h +++ b/WebCore/loader/FrameLoaderClient.h @@ -73,15 +73,11 @@ namespace WebCore { class String; class Widget; -<<<<<<< HEAD:WebCore/loader/FrameLoaderClient.h #ifdef ANDROID_HISTORY_CLIENT class BackForwardList; #endif - typedef void (FrameLoader::*FramePolicyFunction)(PolicyAction); -======= typedef void (PolicyChecker::*FramePolicyFunction)(PolicyAction); ->>>>>>> webkit.org at 49305:WebCore/loader/FrameLoaderClient.h class FrameLoaderClient { public: |