Delete glue/webview{_delegate}.h

R=dglazkov
BUG=10033
TEST=none

Review URL: http://codereview.chromium.org/293001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29390 0039d316-1c4b-4281-b951-d872f2087c98

11 files changed, 41 insertions, 31 deletions

diff --git a/chrome/renderer/devtools_agent.cc b/chrome/renderer/devtools_agent.cc
index 3a05c25..ca70cc1 100644
--- a/chrome/renderer/devtools_agent.cc
+++ b/chrome/renderer/devtools_agent.cc
@@ -14,6 +14,7 @@
 using WebKit::WebDevToolsAgent;
 using WebKit::WebPoint;
 using WebKit::WebString;
+using WebKit::WebView;
 
 // static
 std::map<int, DevToolsAgent*> DevToolsAgent::agent_for_routing_id_;
diff --git a/chrome/renderer/extensions/bindings_utils.cc b/chrome/renderer/extensions/bindings_utils.cc
index 42d3e7c..6c35b25 100644
--- a/chrome/renderer/extensions/bindings_utils.cc
+++ b/chrome/renderer/extensions/bindings_utils.cc
@@ -9,6 +9,7 @@
 #include "webkit/api/public/WebFrame.h"
 
 using WebKit::WebFrame;
+using WebKit::WebView;
 
 namespace bindings_utils {
 
diff --git a/chrome/renderer/extensions/extension_process_bindings.cc b/chrome/renderer/extensions/extension_process_bindings.cc
index fffd844..50f596e0 100644
--- a/chrome/renderer/extensions/extension_process_bindings.cc
+++ b/chrome/renderer/extensions/extension_process_bindings.cc
@@ -37,6 +37,7 @@ using bindings_utils::PendingRequest;
 using bindings_utils::PendingRequestMap;
 using bindings_utils::ExtensionBase;
 using WebKit::WebFrame;
+using WebKit::WebView;
 
 namespace {
 
diff --git a/chrome/renderer/extensions/extension_process_bindings.h b/chrome/renderer/extensions/extension_process_bindings.h
index 77e5854..1009932 100644
--- a/chrome/renderer/extensions/extension_process_bindings.h
+++ b/chrome/renderer/extensions/extension_process_bindings.h
@@ -16,7 +16,10 @@
 
 class GURL;
 class URLPattern;
+
+namespace WebKit {
 class WebView;
+}
 
 class ExtensionProcessBindings {
  public:
@@ -58,7 +61,7 @@ class ExtensionProcessBindings {
   // For EXTENSION_* |type| values, adds/replaces a special class name on to
   // the document element (e.g. "extension_toolstrip", "extension_mole") so
   // that the page can use CSS rules to control its display appropriately.
-  static void SetViewType(WebView* view, ViewType::Type type);
+  static void SetViewType(WebKit::WebView* view, ViewType::Type type);
 };
 
 #endif  // CHROME_RENDERER_EXTENSIONS_EXTENSION_PROCESS_BINDINGS_H_
diff --git a/chrome/renderer/external_extension.cc b/chrome/renderer/external_extension.cc
index 45585b9..a4180d4 100644
--- a/chrome/renderer/external_extension.cc
+++ b/chrome/renderer/external_extension.cc
@@ -7,6 +7,7 @@
 #include "webkit/api/public/WebFrame.h"
 
 using WebKit::WebFrame;
+using WebKit::WebView;
 
 namespace extensions_v8 {
 
diff --git a/chrome/renderer/print_web_view_helper.cc b/chrome/renderer/print_web_view_helper.cc
index 780d02f..804de0f 100644
--- a/chrome/renderer/print_web_view_helper.cc
+++ b/chrome/renderer/print_web_view_helper.cc
@@ -23,6 +23,7 @@ using WebKit::WebRect;
 using WebKit::WebScreenInfo;
 using WebKit::WebString;
 using WebKit::WebURLRequest;
+using WebKit::WebView;
 
 PrepareFrameAndViewForPrint::PrepareFrameAndViewForPrint(
     const ViewMsg_Print_Params& print_params,
@@ -63,13 +64,14 @@ PrepareFrameAndViewForPrint::~PrepareFrameAndViewForPrint() {
 
 PrintWebViewHelper::PrintWebViewHelper(RenderView* render_view)
     : render_view_(render_view),
+      print_web_view_(NULL),
       user_cancelled_scripted_print_count_(0) {}
 
 PrintWebViewHelper::~PrintWebViewHelper() {}
 
 void PrintWebViewHelper::DidFinishPrinting(bool success) {
   if (!success) {
-    WebView* web_view = print_web_view_.get();
+    WebView* web_view = print_web_view_;
     if (!web_view)
       web_view = render_view_->webview();
 
@@ -80,9 +82,9 @@ void PrintWebViewHelper::DidFinishPrinting(bool success) {
             l10n_util::GetString(IDS_PRINT_SPOOL_FAILED_ERROR_TEXT)));
   }
 
-  if (print_web_view_.get()) {
+  if (print_web_view_) {
     print_web_view_->close();
-    print_web_view_.release();  // Close deletes object.
+    print_web_view_ = NULL;
     print_pages_params_.reset();
   }
 }
@@ -96,8 +98,8 @@ bool PrintWebViewHelper::CopyAndPrint(const ViewMsg_PrintPages_Params& params,
   prefs.javascript_enabled = false;
   prefs.java_enabled = false;
 
-  print_web_view_.reset(WebView::Create(this));
-  prefs.Apply(print_web_view_.get());
+  print_web_view_ = WebView::create(this);
+  prefs.Apply(print_web_view_);
   print_web_view_->initializeMainFrame(NULL);
 
   print_pages_params_.reset(new ViewMsg_PrintPages_Params(params));
diff --git a/chrome/renderer/print_web_view_helper.h b/chrome/renderer/print_web_view_helper.h
index 1148ae4..87a7ca6 100644
--- a/chrome/renderer/print_web_view_helper.h
+++ b/chrome/renderer/print_web_view_helper.h
@@ -10,7 +10,7 @@
 #include "base/gfx/size.h"
 #include "base/scoped_ptr.h"
 #include "base/time.h"
-#include "webkit/glue/webview_delegate.h"
+#include "webkit/api/public/WebViewClient.h"
 
 namespace gfx {
 class Size;
@@ -28,12 +28,10 @@ typedef PdfPsMetafile NativeMetafile;
 #endif
 
 class RenderView;
-class WebView;
 struct ViewMsg_Print_Params;
 struct ViewMsg_PrintPage_Params;
 struct ViewMsg_PrintPages_Params;
 
-
 // Class that calls the Begin and End print functions on the frame and changes
 // the size of the view temporarily to support full page printing..
 // Do not serve any events in the time between construction and destruction of
@@ -42,7 +40,7 @@ class PrepareFrameAndViewForPrint {
  public:
   PrepareFrameAndViewForPrint(const ViewMsg_Print_Params& print_params,
                               WebKit::WebFrame* frame,
-                              WebView* web_view);
+                              WebKit::WebView* web_view);
   ~PrepareFrameAndViewForPrint();
 
   int GetExpectedPageCount() const {
@@ -55,7 +53,7 @@ class PrepareFrameAndViewForPrint {
 
  private:
   WebKit::WebFrame* frame_;
-  WebView* web_view_;
+  WebKit::WebView* web_view_;
   gfx::Size print_canvas_size_;
   gfx::Size prev_view_size_;
   int expected_pages_count_;
@@ -67,7 +65,7 @@ class PrepareFrameAndViewForPrint {
 // PrintWebViewHelper handles most of the printing grunt work for RenderView.
 // We plan on making print asynchronous and that will require copying the DOM
 // of the document and creating a new WebView with the contents.
-class PrintWebViewHelper : public WebViewDelegate {
+class PrintWebViewHelper : public WebKit::WebViewClient {
  public:
   explicit PrintWebViewHelper(RenderView* render_view);
   virtual ~PrintWebViewHelper();
@@ -76,7 +74,7 @@ class PrintWebViewHelper : public WebViewDelegate {
 
   // Is there a background print in progress?
   bool IsPrinting() {
-    return print_web_view_.get() != NULL;
+    return print_web_view_ != NULL;
   }
 
   // Notification when printing is done - signal teardown
@@ -117,7 +115,7 @@ class PrintWebViewHelper : public WebViewDelegate {
   int32 routing_id();
 
   // WebKit::WebViewClient
-  virtual WebView* createView(WebKit::WebFrame* creator) { return NULL; }
+  virtual WebKit::WebView* createView(WebKit::WebFrame* creator) { return NULL; }
   virtual WebKit::WebWidget* createPopupMenu(bool activatable) { return NULL; }
   virtual WebKit::WebWidget* createPopupMenu(
       const WebKit::WebPopupMenuInfo& info) { return NULL; }
@@ -235,7 +233,7 @@ class PrintWebViewHelper : public WebViewDelegate {
 
  private:
   RenderView* render_view_;
-  scoped_ptr<WebView> print_web_view_;
+  WebKit::WebView* print_web_view_;
   scoped_ptr<ViewMsg_PrintPages_Params> print_pages_params_;
   base::Time last_cancelled_script_print_;
   int user_cancelled_scripted_print_count_;
diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc
index bf6e3ac..0e68f82 100644
--- a/chrome/renderer/render_thread.cc
+++ b/chrome/renderer/render_thread.cc
@@ -70,6 +70,7 @@ using WebKit::WebCrossOriginPreflightResultCache;
 using WebKit::WebFontCache;
 using WebKit::WebString;
 using WebKit::WebStorageEventDispatcher;
+using WebKit::WebView;
 
 namespace {
 static const unsigned int kCacheStatsDelayMS = 2000 /* milliseconds */;
@@ -216,11 +217,11 @@ void RenderThread::OnUpdateVisitedLinks(base::SharedMemoryHandle table) {
 void RenderThread::OnAddVisitedLinks(
     const VisitedLinkSlave::Fingerprints& fingerprints) {
   for (size_t i = 0; i < fingerprints.size(); ++i)
-    WebView::UpdateVisitedLinkState(fingerprints[i]);
+    WebView::updateVisitedLinkState(fingerprints[i]);
 }
 
 void RenderThread::OnResetVisitedLinks() {
-  WebView::ResetVisitedLinkState();
+  WebView::resetVisitedLinkState();
 }
 
 void RenderThread::OnUpdateUserScripts(
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index b36ebda..474229f 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -97,7 +97,6 @@
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/webmediaplayer_impl.h"
 #include "webkit/glue/webplugin_impl.h"
-#include "webkit/glue/webview.h"
 
 #if defined(OS_WIN)
 // TODO(port): these files are currently Windows only because they concern:
@@ -152,6 +151,7 @@ using WebKit::WebURLError;
 using WebKit::WebURLRequest;
 using WebKit::WebURLResponse;
 using WebKit::WebVector;
+using WebKit::WebView;
 using WebKit::WebWidget;
 using WebKit::WebWorker;
 using WebKit::WebWorkerClient;
@@ -346,7 +346,7 @@ void RenderView::Init(gfx::NativeViewId parent_hwnd,
 
   devtools_agent_.reset(new DevToolsAgent(routing_id, this));
 
-  webwidget_ = WebView::Create(this);
+  webwidget_ = WebView::create(this);
   Singleton<ViewMap>::get()->insert(std::make_pair(webview(), this));
   webkit_preferences_.Apply(webview());
   webview()->initializeMainFrame(this);
diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h
index 7ccf210..bcf3610 100644
--- a/chrome/renderer/render_view.h
+++ b/chrome/renderer/render_view.h
@@ -38,8 +38,11 @@
 #include "webkit/api/public/WebConsoleMessage.h"
 #include "webkit/api/public/WebContextMenuData.h"
 #include "webkit/api/public/WebFrameClient.h"
+#include "webkit/api/public/WebMediaPlayerAction.h"
 #include "webkit/api/public/WebNode.h"
 #include "webkit/api/public/WebTextDirection.h"
+#include "webkit/api/public/WebView.h"
+#include "webkit/api/public/WebViewClient.h"
 #include "webkit/glue/dom_serializer_delegate.h"
 #include "webkit/glue/form_data.h"
 #include "webkit/glue/image_resource_fetcher.h"
@@ -47,8 +50,6 @@
 #include "webkit/glue/webaccessibilitymanager.h"
 #include "webkit/glue/webplugin_page_delegate.h"
 #include "webkit/glue/webpreferences.h"
-#include "webkit/glue/webview_delegate.h"
-#include "webkit/glue/webview.h"
 
 #if defined(OS_WIN)
 // RenderView is a diamond-shaped hierarchy, with WebWidgetClient at the root.
@@ -109,7 +110,7 @@ typedef base::RefCountedData<int> SharedRenderViewCounter;
 // communication interface with an embedding application process
 //
 class RenderView : public RenderWidget,
-                   public WebViewDelegate,
+                   public WebKit::WebViewClient,
                    public WebKit::WebFrameClient,
                    public webkit_glue::WebPluginPageDelegate,
                    public webkit_glue::DomSerializerDelegate,
@@ -120,7 +121,7 @@ class RenderView : public RenderWidget,
   static void ForEach(RenderViewVisitor* visitor);
 
   // Returns the RenderView containing the given WebView.
-  static RenderView* FromWebView(WebView* webview);
+  static RenderView* FromWebView(WebKit::WebView* webview);
 
   // Creates a new RenderView.  The parent_hwnd specifies a HWND to use as the
   // parent of the WebView HWND that will be created.  If this is a constrained
@@ -141,8 +142,8 @@ class RenderView : public RenderWidget,
   static void SetNextPageID(int32 next_page_id);
 
   // May return NULL when the view is closing.
-  WebView* webview() const {
-    return static_cast<WebView*>(webwidget());
+  WebKit::WebView* webview() const {
+    return static_cast<WebKit::WebView*>(webwidget());
   }
 
   gfx::NativeViewId host_window() const {
@@ -178,7 +179,7 @@ class RenderView : public RenderWidget,
   virtual void DnsPrefetch(const std::vector<std::string>& host_names);
 
   // WebKit::WebViewClient
-  virtual WebView* createView(WebKit::WebFrame* creator);
+  virtual WebKit::WebView* createView(WebKit::WebFrame* creator);
   virtual WebKit::WebWidget* createPopupMenu(bool activatable);
   virtual WebKit::WebWidget* createPopupMenu(
       const WebKit::WebPopupMenuInfo& info);
@@ -502,7 +503,7 @@ class RenderView : public RenderWidget,
 
   // Creates a thumbnail of |frame|'s contents resized to (|w|, |h|)
   // and puts that in |thumbnail|. Thumbnail metadata goes in |score|.
-  bool CaptureThumbnail(WebView* view, int w, int h,
+  bool CaptureThumbnail(WebKit::WebView* view, int w, int h,
                         SkBitmap* thumbnail,
                         ThumbnailScore* score);
 
@@ -988,7 +989,7 @@ class RenderView : public RenderWidget,
   typedef std::set<webkit_glue::ImageResourceFetcher*> ImageResourceFetcherSet;
   ImageResourceFetcherSet image_fetchers_;
 
-  typedef std::map<WebView*, RenderView*> ViewMap;
+  typedef std::map<WebKit::WebView*, RenderView*> ViewMap;
 
   DISALLOW_COPY_AND_ASSIGN(RenderView);
 };
diff --git a/chrome/renderer/webplugin_delegate_proxy.cc b/chrome/renderer/webplugin_delegate_proxy.cc
index b15de39..9faed18 100644
--- a/chrome/renderer/webplugin_delegate_proxy.cc
+++ b/chrome/renderer/webplugin_delegate_proxy.cc
@@ -35,9 +35,9 @@
 #include "webkit/api/public/WebFrame.h"
 #include "webkit/api/public/WebString.h"
 #include "webkit/api/public/WebVector.h"
+#include "webkit/api/public/WebView.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/webplugin.h"
-#include "webkit/glue/webview.h"
 
 #if defined(OS_POSIX)
 #include "ipc/ipc_channel_posix.h"
@@ -49,10 +49,11 @@
 
 using WebKit::WebBindings;
 using WebKit::WebCursorInfo;
-using WebKit::WebInputEvent;
 using WebKit::WebDragData;
-using WebKit::WebVector;
+using WebKit::WebInputEvent;
 using WebKit::WebString;
+using WebKit::WebVector;
+using WebKit::WebView;
 
 // Proxy for WebPluginResourceClient.  The object owns itself after creation,
 // deleting itself after its callback has been called.