Move API layer-only classes back from the shared static lib.

Since ContentBrowserClientQt::OverrideCreateWebContentsView now
takes care of using our Qt layer at runtime without relying on
the static RenderWidgetHostView::CreateViewForWidget, we can
now avoid linking this layer into the render process.

16 files changed, 22 insertions, 24 deletions

diff --git a/shared/backing_store_qt.cpp b/lib/backing_store_qt.cpp
index cee0d093e..cee0d093e 100644
--- a/shared/backing_store_qt.cpp
+++ b/lib/backing_store_qt.cpp
diff --git a/shared/backing_store_qt.h b/lib/backing_store_qt.h
index d2fa52f38..d2fa52f38 100644
--- a/shared/backing_store_qt.h
+++ b/lib/backing_store_qt.h
diff --git a/lib/lib.pro b/lib/lib.pro
index e4f75a65c..5f2507bbe 100644
--- a/lib/lib.pro
+++ b/lib/lib.pro
@@ -20,27 +20,34 @@ CONFIG(release, debug|release): DEFINES += NDEBUG
 QT += widgets quick
 
 SOURCES = \
+        backing_store_qt.cpp \
         content_browser_client_qt.cpp \
         qquickwebcontentsview.cpp \
         qwebcontentsview.cpp \
+        render_widget_host_view_qt.cpp \
         render_widget_host_view_qt_delegate_quick.cpp \
         render_widget_host_view_qt_delegate_widget.cpp \
         resource_context_qt.cpp \
         url_request_context_getter_qt.cpp \
         web_contents_delegate_qt.cpp \
-        web_engine_context.cpp
+        web_engine_context.cpp \
+        web_event_factory.cpp
 
 HEADERS = \
+        backing_store_qt.h \
         browser_context_qt.h \
         content_browser_client_qt.h \
         qquickwebcontentsview.h \
         qwebcontentsview.h \
         qwebcontentsview_p.h \
+        render_widget_host_view_qt.h \
+        render_widget_host_view_qt_delegate.h \
         render_widget_host_view_qt_delegate_quick.h \
         render_widget_host_view_qt_delegate_widget.h \
         resource_context_qt.h \
         url_request_context_getter_qt.h \
         web_contents_delegate_qt.h \
         web_contents_view_qt.h \
-        web_engine_context.h
+        web_engine_context.h \
+        web_event_factory.h
 
diff --git a/shared/render_widget_host_view_qt.cpp b/lib/render_widget_host_view_qt.cpp
index 9be9d6f35..2d21410d0 100644
--- a/shared/render_widget_host_view_qt.cpp
+++ b/lib/render_widget_host_view_qt.cpp
@@ -43,9 +43,10 @@
 
 #include "backing_store_qt.h"
 #include "render_widget_host_view_qt_delegate.h"
-#include "shared_globals.h"
 #include "web_event_factory.h"
 
+#include "shared/shared_globals.h"
+
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/common/gpu/gpu_messages.h"
 
diff --git a/shared/render_widget_host_view_qt.h b/lib/render_widget_host_view_qt.h
index 9ff200c32..9ff200c32 100644
--- a/shared/render_widget_host_view_qt.h
+++ b/lib/render_widget_host_view_qt.h
diff --git a/shared/render_widget_host_view_qt_delegate.h b/lib/render_widget_host_view_qt_delegate.h
index 7f147dae6..7f147dae6 100644
--- a/shared/render_widget_host_view_qt_delegate.h
+++ b/lib/render_widget_host_view_qt_delegate.h
diff --git a/lib/render_widget_host_view_qt_delegate_quick.cpp b/lib/render_widget_host_view_qt_delegate_quick.cpp
index 13e4ef29f..c1b4c6627 100644
--- a/lib/render_widget_host_view_qt_delegate_quick.cpp
+++ b/lib/render_widget_host_view_qt_delegate_quick.cpp
@@ -1,7 +1,7 @@
 #include "render_widget_host_view_qt_delegate_quick.h"
 
-#include "shared/backing_store_qt.h"
-#include "shared/render_widget_host_view_qt.h"
+#include "backing_store_qt.h"
+#include "render_widget_host_view_qt.h"
 
 #include "content/browser/renderer_host/render_view_host_impl.h"
 
diff --git a/lib/render_widget_host_view_qt_delegate_quick.h b/lib/render_widget_host_view_qt_delegate_quick.h
index 20bd263f8..9422a7eb4 100644
--- a/lib/render_widget_host_view_qt_delegate_quick.h
+++ b/lib/render_widget_host_view_qt_delegate_quick.h
@@ -1,7 +1,7 @@
 #ifndef RENDER_WIDGET_HOST_VIEW_QT_DELEGATE_QUICK_H
 #define RENDER_WIDGET_HOST_VIEW_QT_DELEGATE_QUICK_H
 
-#include "shared/render_widget_host_view_qt_delegate.h"
+#include "render_widget_host_view_qt_delegate.h"
 
 #include <QQuickPaintedItem>
 
diff --git a/lib/render_widget_host_view_qt_delegate_widget.cpp b/lib/render_widget_host_view_qt_delegate_widget.cpp
index 9a659069f..fe093c6b6 100644
--- a/lib/render_widget_host_view_qt_delegate_widget.cpp
+++ b/lib/render_widget_host_view_qt_delegate_widget.cpp
@@ -1,7 +1,7 @@
 #include "render_widget_host_view_qt_delegate_widget.h"
 
-#include "shared/backing_store_qt.h"
-#include "shared/render_widget_host_view_qt.h"
+#include "backing_store_qt.h"
+#include "render_widget_host_view_qt.h"
 
 #include "content/browser/renderer_host/render_view_host_impl.h"
 
diff --git a/lib/render_widget_host_view_qt_delegate_widget.h b/lib/render_widget_host_view_qt_delegate_widget.h
index f6da4f484..1cc894ce3 100644
--- a/lib/render_widget_host_view_qt_delegate_widget.h
+++ b/lib/render_widget_host_view_qt_delegate_widget.h
@@ -1,7 +1,7 @@
 #ifndef RENDER_WIDGET_HOST_VIEW_QT_DELEGATE_WIDGET_H
 #define RENDER_WIDGET_HOST_VIEW_QT_DELEGATE_WIDGET_H
 
-#include "shared/render_widget_host_view_qt_delegate.h"
+#include "render_widget_host_view_qt_delegate.h"
 
 #include <QWidget>
 
diff --git a/lib/web_contents_view_qt.h b/lib/web_contents_view_qt.h
index d20f8fec6..08ffd4e78 100644
--- a/lib/web_contents_view_qt.h
+++ b/lib/web_contents_view_qt.h
@@ -48,7 +48,7 @@
 #include "content/port/browser/render_view_host_delegate_view.h"
 #include "content/port/browser/web_contents_view_port.h"
 
-#include "shared/render_widget_host_view_qt.h"
+#include "render_widget_host_view_qt.h"
 
 class WebContentsViewQtClient {
 public:
diff --git a/shared/web_event_factory.cpp b/lib/web_event_factory.cpp
index ed24c5b6d..ed24c5b6d 100644
--- a/shared/web_event_factory.cpp
+++ b/lib/web_event_factory.cpp
diff --git a/shared/web_event_factory.h b/lib/web_event_factory.h
index 061200ccc..061200ccc 100644
--- a/shared/web_event_factory.h
+++ b/lib/web_event_factory.h
diff --git a/process/process.pro b/process/process.pro
index 131fad9e6..74227b2e2 100644
--- a/process/process.pro
+++ b/process/process.pro
@@ -7,6 +7,4 @@ GYPDEPENDENCIES += ../shared/shared.gyp:qtwebengine_shared
 TARGET = $$QTWEBENGINEPROCESS_NAME
 TEMPLATE = app
 
-QT += widgets quick
-
 SOURCES = main.cpp
diff --git a/shared/shared.pro b/shared/shared.pro
index f51032417..fd394ae63 100644
--- a/shared/shared.pro
+++ b/shared/shared.pro
@@ -18,18 +18,10 @@ PER_CONFIG_DEFINES = QTWEBENGINEPROCESS_PATH=\\\"$$getOutDir()/%config/$$QTWEBEN
 # Keep Skia happy
 CONFIG(release, debug|release): DEFINES += NDEBUG
 
-QT += widgets quick
+QT += gui
 
 SOURCES = \
-        backing_store_qt.cpp \
-        render_widget_host_view_qt.cpp \
-        shared_globals.cpp \
-        web_event_factory.cpp
+        shared_globals.cpp
 
 HEADERS = \
-        backing_store_qt.h \
-        render_widget_host_view_qt.h \
-        render_widget_host_view_qt_delegate.h \
-        shared_globals.h \
-        web_event_factory.h
-
+        shared_globals.h
diff --git a/shared/shared_globals.cpp b/shared/shared_globals.cpp
index 9a23c8db1..eab332869 100644
--- a/shared/shared_globals.cpp
+++ b/shared/shared_globals.cpp
@@ -44,7 +44,7 @@
 #include "content/browser/renderer_host/render_widget_host_view_base.h"
 
 #include <QScreen>
-#include <QQuickWindow>
+#include <QWindow>
 
 namespace content {