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

chrome/renderer/render_view.h

 // Copyright (c) 2009 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 CHROME_RENDERER_RENDER_VIEW_H_
 #define CHROME_RENDERER_RENDER_VIEW_H_
 
 #include <string>
 #include <queue>
 #include <vector>
@@ skipping 17 matching lines @@
 #include "testing/gtest/include/gtest/gtest_prod.h"
 #include "webkit/api/public/WebConsoleMessage.h"
 #include "webkit/glue/dom_serializer_delegate.h"
 #include "webkit/glue/form_data.h"
 #include "webkit/glue/password_form_dom_manager.h"
 #include "webkit/glue/webaccessibilitymanager.h"
 #include "webkit/glue/webview_delegate.h"
 #include "webkit/glue/webview.h"
 
 #if defined(OS_WIN)
-// RenderView is a diamond-shaped hierarchy, with WebWidgetDelegate at the root.
-// VS warns when we inherit the WebWidgetDelegate method implementations from
+// RenderView is a diamond-shaped hierarchy, with WebWidgetClient at the root.
+// VS warns when we inherit the WebWidgetClient method implementations from
 // RenderWidget.  It's safe to ignore that warning.
 #pragma warning(disable: 4250)
 #endif
 
 class AudioMessageFilter;
 class DictionaryValue;
 class DevToolsAgent;
 class DevToolsClient;
 class FilePath;
 class GURL;
@@ skipping 145 matching lines @@
   virtual void DidFinishDocumentLoadForFrame(WebView* webview, WebFrame* frame);
   virtual bool DidLoadResourceFromMemoryCache(
       WebView* webview,
       const WebKit::WebURLRequest& request,
       const WebKit::WebURLResponse& response,
       WebFrame* frame);
   virtual void DidHandleOnloadEventsForFrame(WebView* webview, WebFrame* frame);
   virtual void DidChangeLocationWithinPageForFrame(WebView* webview,
                                                    WebFrame* frame,
                                                    bool is_new_navigation);
-  virtual void DidContentsSizeChange(WebWidget* webwidget,
+  virtual void DidContentsSizeChange(WebKit::WebWidget* webwidget,
                                      int new_width,
                                      int new_height);
 
   virtual void DidCompleteClientRedirect(WebView* webview,
                                          WebFrame* frame,
                                          const GURL& source);
   virtual void WillCloseFrame(WebView* webview, WebFrame* frame);
   virtual void WillSubmitForm(WebView* webview, WebFrame* frame,
                               const WebKit::WebForm& form);
   virtual void WillSendRequest(WebView* webview,
                                uint32 identifier,
                                WebKit::WebURLRequest* request);
 
   virtual void WindowObjectCleared(WebFrame* webframe);
   virtual void DocumentElementAvailable(WebFrame* webframe);
   virtual void DidCreateScriptContextForFrame(WebFrame* webframe);
   virtual void DidDestroyScriptContextForFrame(WebFrame* webframe);
   virtual void DidCreateIsolatedScriptContext(WebFrame* webframe);
 
-  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);
 
   virtual WebView* CreateWebView(WebView* webview,
                                  bool user_gesture,
                                  const GURL& creator_url);
-  virtual WebWidget* CreatePopupWidget(WebView* webview, bool activatable);
-  virtual WebWidget* CreatePopupWidgetWithInfo(
+  virtual WebKit::WebWidget* CreatePopupWidget(
+      WebView* webview,
+      bool activatable);
+  virtual WebKit::WebWidget* CreatePopupWidgetWithInfo(
       WebView* webview,
       const WebKit::WebPopupMenuInfo& info);
   virtual WebPluginDelegate* CreatePluginDelegate(
       WebView* webview,
       const GURL& url,
       const std::string& mime_type,
       const std::string& clsid,
       std::string* actual_mime_type);
   virtual WebKit::WebWorker* CreateWebWorker(WebKit::WebWorkerClient* client);
   virtual WebKit::WebMediaPlayer* CreateWebMediaPlayer(
       WebKit::WebMediaPlayerClient* client);
   virtual void OnMissingPluginStatus(WebPluginDelegate* delegate, int status);
   virtual void OpenURL(WebView* webview, const GURL& url,
                        const GURL& referrer,
-                       WindowOpenDisposition disposition);
+                       WebKit::WebNavigationPolicy policy);
   virtual void DidDownloadImage(int id,
                                 const GURL& image_url,
                                 bool errored,
                                 const SkBitmap& image);
   virtual GURL GetAlternateErrorPageURL(const GURL& failedURL,
                                         ErrorPageType error_type);
 
   virtual void ShowContextMenu(WebView* webview,
                                ContextNode node,
                                int x,
@@ skipping 31 matching lines @@
 
   virtual void PasteFromSelectionClipboard();
 
   virtual void ReportFindInPageMatchCount(int count, int request_id,
                                           bool final_update);
   virtual void ReportFindInPageSelection(int request_id,
                                          int active_match_ordinal,
                                          const WebKit::WebRect& selection);
   virtual bool WasOpenedByUserGesture() const;
   virtual void FocusAccessibilityObject(WebCore::AccessibilityObject* acc_obj);
+  virtual void DidMovePlugin(const WebPluginGeometry& move);
   virtual void SpellCheck(const std::wstring& word, int* misspell_location,
                           int* misspell_length);
   virtual std::wstring GetAutoCorrectWord(const std::wstring& word);
   virtual void SetInputMethodState(bool enabled);
   virtual void ScriptedPrint(WebFrame* frame);
   virtual void UserMetricsRecordAction(const std::wstring& action);
   virtual void DnsPrefetch(const std::vector<std::string>& host_names);
 
   // DomSerializerDelegate
   virtual void DidSerializeDataForFrame(const GURL& frame_url,
       const std::string& data, PageSavingSerializationStatus status);
 
-  // WebWidgetDelegate
+  // WebKit::WebWidgetClient
   // Most methods are handled by RenderWidget.
-  virtual void Show(WebWidget* webwidget, WindowOpenDisposition disposition);
-  virtual void CloseWidgetSoon(WebWidget* webwidget);
-  virtual void RunModal(WebWidget* webwidget);
+  virtual void show(WebKit::WebNavigationPolicy policy);
+  virtual void closeWidgetSoon();
+  virtual void runModal();
 
   // Do not delete directly.  This class is reference counted.
   virtual ~RenderView();
 
   // Called when a plugin is destroyed.
   void PluginDestroyed(WebPluginDelegateProxy* proxy);
 
   // Called when a plugin has crashed.
   void PluginCrashed(base::ProcessId pid, const FilePath& plugin_path);
 
@@ skipping 464 matching lines @@
   // PrintWebViewHelper handles printing.  Note that this object is constructed
   // when printing for the first time but only destroyed with the RenderView.
   scoped_ptr<PrintWebViewHelper> print_helper_;
 
   RendererPreferences renderer_preferences_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderView);
 };
 
 #endif  // CHROME_RENDERER_RENDER_VIEW_H_