Use WebWidget from the WebKit API. This change also makes...

webkit/glue/webframeloaderclient_impl.h

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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;
 class HTMLFormElement;
 class Widget;
 }
 
 namespace webkit_glue {
 class Alt404PageResourceFetcher;
 }
@@ skipping 180 matching lines @@
 
   // Callback function for download of alternate 404 pages.  If the server is
   // down or we take more than 1s to download the page, html will be an empty
   // string.
   void Alt404PageFinished(WebCore::DocumentLoader* loader,
                           const std::string& html);
 
  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);
 
   // Returns NavigationGestureAuto if the last load was not user initiated,
   // otherwise returns NavigationGestureUnknown.
   NavigationGesture NavigationGestureForLastLoad();
 
   // Called when a dummy back-forward navigation is intercepted.
   void HandleBackForwardNavigation(const GURL&);
@@ skipping 22 matching lines @@
   GURL expected_client_redirect_src_;
   GURL expected_client_redirect_dest_;
 
   // Contains a pointer to the plugin widget.
   WTF::RefPtr<WebPluginContainer> plugin_widget_;
 
   // Indicates if we need to send over the initial notification to the plugin
   // 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__