diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-16 06:36:28 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-16 06:36:28 +0000 |
| commit | 4873c7de675554a357717ddedc1fcaca2820de19 (patch) | |
| tree | cd6446547d3b9d57f634187aecb1853c5ecbc8fb /webkit/glue/webframeloaderclient_impl.h | |
| parent | 3b846396a90174835320be2ff50afe8dd4e31590 (diff) | |
| download | chromium_src-4873c7de675554a357717ddedc1fcaca2820de19.zip chromium_src-4873c7de675554a357717ddedc1fcaca2820de19.tar.gz chromium_src-4873c7de675554a357717ddedc1fcaca2820de19.tar.bz2 | |
Reverting 20855.
Review URL: http://codereview.chromium.org/149744
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20859 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webframeloaderclient_impl.h')
| -rw-r--r-- | webkit/glue/webframeloaderclient_impl.h | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/webkit/glue/webframeloaderclient_impl.h b/webkit/glue/webframeloaderclient_impl.h index 80e5d3b..e031fae 100644 --- a/webkit/glue/webframeloaderclient_impl.h +++ b/webkit/glue/webframeloaderclient_impl.h @@ -5,18 +5,13 @@ #ifndef WEBKIT_GLUE_WEBFRAMELOADERCLIENT_IMPL_H__ #define WEBKIT_GLUE_WEBFRAMELOADERCLIENT_IMPL_H__ -#include "base/compiler_specific.h" - -MSVC_PUSH_WARNING_LEVEL(0); #include "FrameLoaderClient.h" #include <wtf/RefPtr.h> -MSVC_POP_WARNING(); -#include "build/build_config.h" #include "base/scoped_ptr.h" #include "googleurl/src/gurl.h" +#include "webkit/api/public/WebNavigationPolicy.h" #include "webkit/glue/webview_delegate.h" -#include "webkit/glue/window_open_disposition.h" namespace WebCore { class Frame; @@ -217,11 +212,11 @@ class WebFrameLoaderClient : public WebCore::FrameLoaderClient { private: void makeDocumentView(); - // Given a NavigationAction, determine the associated window opening - // disposition. For example, a middle click means "open in background tab". - static bool ActionSpecifiesDisposition( + // Given a NavigationAction, determine the associated WebNavigationPolicy. + // For example, a middle click means "open in background tab". + static bool ActionSpecifiesNavigationPolicy( const WebCore::NavigationAction& action, - WindowOpenDisposition* disposition); + WebKit::WebNavigationPolicy* policy); // Returns a valid GURL if we have an alt 404 server URL. GURL GetAlt404PageUrl(WebCore::DocumentLoader* loader); @@ -264,8 +259,8 @@ class WebFrameLoaderClient : public WebCore::FrameLoaderClient { // which specifies that the plugin should be ready to accept data. bool sent_initial_response_to_plugin_; - // The disposition to use for the next call to dispatchCreatePage. - WindowOpenDisposition next_window_open_disposition_; + // The navigation policy to use for the next call to dispatchCreatePage. + WebKit::WebNavigationPolicy next_navigation_policy_; }; #endif // #ifndef WEBKIT_GLUE_WEBFRAMELOADERCLIENT_IMPL_H__ |