Stop using OverrideCreateWebContentsView for creating the contents view

Use the content::CreateWebContentsView factory function to create the
contents view since we already have to implement it.

Change-Id: Ib60cb29604ac84877e154a47ae27f44672284726
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>

4 files changed, 11 insertions, 13 deletions

diff --git a/lib/content_browser_client_qt.cpp b/lib/content_browser_client_qt.cpp
index 68eab7f65..048e4f9c2 100644
--- a/lib/content_browser_client_qt.cpp
+++ b/lib/content_browser_client_qt.cpp
@@ -93,15 +93,6 @@ private:
     DISALLOW_COPY_AND_ASSIGN(BrowserMainPartsQt);
 };
 
-
-content::WebContentsViewPort* ContentBrowserClientQt::OverrideCreateWebContentsView(content::WebContents* web_contents, content::RenderViewHostDelegateView** render_view_host_delegate_view)
-{
-    fprintf(stderr, "OverrideCreateWebContentsView\n");
-    WebContentsViewQt* rv = new WebContentsViewQt(web_contents);
-    *render_view_host_delegate_view = rv;
-    return rv;
-}
-
 content::BrowserMainParts *ContentBrowserClientQt::CreateBrowserMainParts(const content::MainFunctionParams &parameters)
 {
     m_browserMainParts = new BrowserMainPartsQt(parameters);
diff --git a/lib/content_browser_client_qt.h b/lib/content_browser_client_qt.h
index 6ac2a62a2..352918233 100644
--- a/lib/content_browser_client_qt.h
+++ b/lib/content_browser_client_qt.h
@@ -43,6 +43,7 @@
 #define CONTENT_BROWSER_CLIENT_QT
 
 #include "content/public/browser/content_browser_client.h"
+#include <QtCore/qcompilerdetection.h> // Needed for Q_DECL_OVERRIDE
 
 namespace net {
 class URLRequestContextGetter;
@@ -64,8 +65,7 @@ class BrowserMainPartsQt;
 class ContentBrowserClientQt : public content::ContentBrowserClient {
 
 public:
-    virtual content::WebContentsViewPort* OverrideCreateWebContentsView(content::WebContents* , content::RenderViewHostDelegateView**) /*Q_DECL_OVERRIDE*/;
-    virtual content::BrowserMainParts* CreateBrowserMainParts(const content::MainFunctionParams& parameters) /*Q_DECL_OVERRIDE*/;
+    virtual content::BrowserMainParts* CreateBrowserMainParts(const content::MainFunctionParams& parameters) Q_DECL_OVERRIDE;
 
 
     BrowserContextQt* browser_context();
diff --git a/lib/web_contents_view_qt.cpp b/lib/web_contents_view_qt.cpp
index c598fedfa..2fc791af4 100644
--- a/lib/web_contents_view_qt.cpp
+++ b/lib/web_contents_view_qt.cpp
@@ -48,7 +48,14 @@
 #include "content/browser/renderer_host/render_view_host_impl.h"
 
 namespace content {
-WebContentsViewPort* CreateWebContentsView(WebContentsImpl* web_contents, WebContentsViewDelegate* delegate, RenderViewHostDelegateView** render_view_host_delegate_view) { return 0; }
+WebContentsViewPort* CreateWebContentsView(WebContentsImpl* web_contents,
+                                           WebContentsViewDelegate* delegate,
+                                           RenderViewHostDelegateView** render_view_host_delegate_view)
+{
+    WebContentsViewQt* rv = new WebContentsViewQt(web_contents, delegate);
+    *render_view_host_delegate_view = rv;
+    return rv;
+}
 }
 
 WebContentsViewQtClient::WebContentsViewQtClient()
diff --git a/lib/web_contents_view_qt.h b/lib/web_contents_view_qt.h
index 456329201..8af3a24dd 100644
--- a/lib/web_contents_view_qt.h
+++ b/lib/web_contents_view_qt.h
@@ -67,7 +67,7 @@ class WebContentsViewQt
     , public content::RenderViewHostDelegateView
 {
 public:
-    WebContentsViewQt(content::WebContents* web_contents)
+    WebContentsViewQt(content::WebContents*, content::WebContentsViewDelegate*)
         : m_client(0)
     { }