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

webkit/glue/webview_delegate.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.
 
 // WebCore provides hooks for several kinds of functionality, allowing separate
 // classes termed "delegates" to receive notifications (in the form of direct
 // function calls) when certain events are about to occur or have just occurred.
 // In some cases, the delegate implements the needed functionality; in others,
 // the delegate has some control over the behavior but doesn't actually
 // implement it.  For example, the UI delegate is responsible for showing a
@@ skipping 11 matching lines @@
 // PolicyDelegate, FrameLoadDelegate, and EditorDelegate; additional portions
 // of ChromeClient and FrameLoaderClient not delegated in the WebKit
 // implementation; and some WebView additions.
 
 #ifndef WEBKIT_GLUE_WEBVIEW_DELEGATE_H_
 #define WEBKIT_GLUE_WEBVIEW_DELEGATE_H_
 
 #include <vector>
 
 #include "base/gfx/native_widget_types.h"
+#include "webkit/api/public/WebNavigationPolicy.h"
 #include "webkit/api/public/WebNavigationType.h"
+#include "webkit/api/public/WebWidgetClient.h"
 #include "webkit/glue/context_menu.h"
-#include "webkit/glue/webwidget_delegate.h"
 
 namespace webkit_glue {
 class WebMediaPlayerDelegate;
 }
 
 namespace WebCore {
 class AccessibilityObject;
 }
 
 namespace WebKit {
 class WebDataSource;
 class WebDragData;
 class WebForm;
 class WebWorker;
 class WebWorkerClient;
 class WebMediaPlayer;
 class WebMediaPlayerClient;
 class WebURLRequest;
 class WebURLResponse;
+class WebWidget;
 struct WebPoint;
 struct WebPopupMenuInfo;
 struct WebRect;
 struct WebURLError;
 }
 
-struct WebPreferences;
 class FilePath;
 class SkBitmap;
 class WebDevToolsAgentDelegate;
 class WebFrame;
 class WebMediaPlayerDelegate;
 class WebPluginDelegate;
 class WebView;
-class WebWidget;
+struct WebPluginGeometry;
+struct WebPreferences;
 
 enum NavigationGesture {
   NavigationGestureUser,    // User initiated navigation/load. This is not
                             // currently used due to the untrustworthy nature
                             // of userGestureHint (wasRunByUserGesture). See
                             // bug 1051891.
   NavigationGestureAuto,    // Non-user initiated navigation / load. For example
                             // onload or setTimeout triggered document.location
                             // changes, and form.submits. See bug 1046841 for
                             // some cases that should be treated this way but
@@ skipping 10 matching lines @@
   WebFileChooserCallback() {}
   virtual ~WebFileChooserCallback() {}
   virtual void OnFileChoose(const std::vector<FilePath>& file_names) { }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(WebFileChooserCallback);
 };
 
 
 // Inheritance here is somewhat weird, but since a WebView is a WebWidget,
-// it makes sense that a WebViewDelegate is a WebWidgetDelegate.
-class WebViewDelegate : virtual public WebWidgetDelegate {
+// it makes sense that a WebViewDelegate is a WebWidgetClient.
+class WebViewDelegate : virtual public WebKit::WebWidgetClient {
  public:
   // WebView additions -------------------------------------------------------
 
   // This method is called to create a new WebView.  The WebView should not be
   // made visible until the new WebView's Delegate has its Show method called.
   // The returned WebView pointer is assumed to be owned by the host window,
   // and the caller of CreateWebView should not release the given WebView.
   // |user_gesture| is true if a user action initiated this call.
   // |creator_url|, if nonempty, holds the security origin of the page creating
   // this WebView.
   virtual WebView* CreateWebView(WebView* webview,
                                  bool user_gesture,
                                  const GURL& creator_url) {
     return NULL;
   }
 
   // This method is called to create a new WebWidget to act as a popup
   // (like a drop-down menu).
-  virtual WebWidget* CreatePopupWidget(WebView* webview, bool activatable) {
+  virtual WebKit::WebWidget* CreatePopupWidget(
+      WebView* webview,
+      bool activatable) {
     return NULL;
   }
 
   // Like CreatePopupWidget, except the actual widget is rendered by the
   // embedder using the supplied info.
-  virtual WebWidget* CreatePopupWidgetWithInfo(
+  virtual WebKit::WebWidget* CreatePopupWidgetWithInfo(
       WebView* webview,
       const WebKit::WebPopupMenuInfo& info) {
     return NULL;
   }
 
   // This method is called to create a WebPluginDelegate implementation when a
   // new plugin is instanced.  See webkit_glue::CreateWebPluginDelegateHelper
   // for a default WebPluginDelegate implementation.
   // TODO(port): clsid is very Win- and ActiveX-specific; refactor to be more
   // platform-neutral
@@ skipping 21 matching lines @@
 
   // Called when a WebMediaPlayer is needed.
   virtual WebKit::WebMediaPlayer* CreateWebMediaPlayer(
       WebKit::WebMediaPlayerClient* client) {
     return NULL;
   }
 
   // This method is called to open a URL in the specified manner.
   virtual void OpenURL(WebView* webview, const GURL& url,
                        const GURL& referrer,
-                       WindowOpenDisposition disposition) {
+                       WebKit::WebNavigationPolicy policy) {
   }
 
   // Notifies how many matches have been found so far, for a given request_id.
   // |final_update| specifies whether this is the last update (all frames have
   // completed scoping).
   virtual void ReportFindInPageMatchCount(int count, int request_id,
                                           bool final_update) {
   }
 
   // Notifies the browser what tick-mark rect is currently selected. Parameter
@@ skipping 12 matching lines @@
     return true;
   }
 
   // Called by ChromeClientImpl::focus() if accessibility on the renderer side
   // is enabled, and a focus change has occurred. Will retrieve the id of the
   // input AccessibilityObject and send it through IPC for handling on the
   // browser side.
   virtual void FocusAccessibilityObject(WebCore::AccessibilityObject* acc_obj) {
   }
 
+  // Keeps track of the necessary window move for a plugin window that resulted
+  // from a scroll operation.  That way, all plugin windows can be moved at the
+  // same time as each other and the page.
+  virtual void DidMovePlugin(const WebPluginGeometry& move) {
+  }
+
   // FrameLoaderClient -------------------------------------------------------
 
   virtual bool CanAcceptLoadDrops() const {
     // Always return true here so layout tests (which use the default WebView
     // delegate) continue to pass.
     return true;
   }
 
   // Notifies the delegate that a load has begun.
   virtual void DidStartLoading(WebView* webview) {
@@ skipping 31 matching lines @@
   // Notifies that a garbage-collected context was created - content scripts.
   virtual void DidCreateIsolatedScriptContext(WebFrame* webframe) {
   }
 
   // PolicyDelegate ----------------------------------------------------------
 
   // This method is called to notify the delegate, and let it modify a
   // proposed navigation. It will be called before loading starts, and
   // on every redirect.
   //
-  // disposition specifies what should normally happen for this
+  // default_policy specifies what should normally happen for this
   // navigation (open in current tab, start a new tab, start a new
-  // window, etc).  This method can return an altered disposition, and
+  // window, etc).  This method can return an altered policy, and
   // take any additional separate action it wants to.
   //
   // is_redirect is true if this is a redirect rather than user action.
-  virtual WindowOpenDisposition DispositionForNavigationAction(
+  virtual WebKit::WebNavigationPolicy PolicyForNavigationAction(
       WebView* webview,
       WebFrame* frame,
       const WebKit::WebURLRequest& request,
       WebKit::WebNavigationType type,
-      WindowOpenDisposition disposition,
+      WebKit::WebNavigationPolicy default_policy,
       bool is_redirect) {
-    return disposition;
+    return default_policy;
   }
 
   // FrameLoadDelegate -------------------------------------------------------
 
   // A datasource has been created for a new navigation.  The given datasource
   // will become the provisional datasource for the frame.
   virtual void DidCreateDataSource(WebFrame* frame,
                                    WebKit::WebDataSource* ds) {
   }
 
@@ skipping 243 matching lines @@
   virtual void QueryFormFieldAutofill(const std::wstring& field_name,
                                       const std::wstring& text,
                                       int64 node_id) {
   }
 
   // Instructs the browser to remove the autofill entry specified from it DB.
   virtual void RemoveStoredAutofillEntry(const std::wstring& name,
                                          const std::wstring& value) {
   }
 
-  virtual void DidContentsSizeChange(WebWidget* webwidget, int new_width,
-                                     int new_height) {
+  virtual void DidContentsSizeChange(WebKit::WebWidget* webwidget,
+                                     int new_width, int new_height) {
   }
 
   // UIDelegate --------------------------------------------------------------
 
   // Asks the browser to show a modal HTML dialog.  The dialog is passed the
   // given arguments as a JSON string, and returns its result as a JSON string
   // through json_retval.
   virtual void ShowModalHTMLDialog(const GURL& url, int width, int height,
                                    const std::string& json_arguments,
                                    std::string* json_retval) {
@@ skipping 291 matching lines @@
   virtual void DidAddHistoryItem() { }
 
   WebViewDelegate() { }
   virtual ~WebViewDelegate() { }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(WebViewDelegate);
 };
 
 #endif  // WEBKIT_GLUE_WEBVIEW_DELEGATE_H_