Split out the Widgets and QtQuick integration

This is the first step to making proper Qt Modules out of QtWebEngine.
The Widgets integration becomes a proper C++ Qt Module while we make
the QtQuick side a QML plugin for now (could probably be promoted if
the need arises).

Code-wise, this means the introduction of a WebContentsAdapterClient
interface that is subclassed by the private implementation of our API
classes for delegation of things that are UI specific. Functionality
from WebContents and the like is exposed via the WebContentsAdapter.

Change-Id: I4ca3395b9fe8502a24e36002cfd5af44067bb6e8
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>

1 files changed, 4 insertions, 8 deletions

diff --git a/lib/web_contents_delegate_qt.h b/lib/web_contents_delegate_qt.h
index dac00b980..85fffcba9 100644
--- a/lib/web_contents_delegate_qt.h
+++ b/lib/web_contents_delegate_qt.h
@@ -52,11 +52,10 @@ namespace content {
     class BrowserContext;
     class SiteInstance;
 }
+class WebContentsAdapterClient;
 
-class WebContentsDelegateQt : public QObject
-                            , public content::WebContentsDelegate
+class WebContentsDelegateQt : public content::WebContentsDelegate
 {
-    Q_OBJECT
 public:
     WebContentsDelegateQt(content::BrowserContext*, content::SiteInstance*, int routing_id, const gfx::Size& initial_size);
     content::WebContents* web_contents();
@@ -64,13 +63,10 @@ public:
     virtual void NavigationStateChanged(const content::WebContents* source, unsigned changed_flags);
     virtual void LoadingStateChanged(content::WebContents* source);
 
-Q_SIGNALS:
-    void titleChanged(const QString& title);
-    void urlChanged(const QUrl& url);
-    void loadingStateChanged();
-
 private:
     scoped_ptr<content::WebContents> m_webContents;
+    WebContentsAdapterClient *m_viewClient;
+    friend class WebContentsAdapter;
 };
 
 #endif