From c68c8cb21b47024bbc6c9d15734677318f56ca3f Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen <allan.jensen@qt.io> Date: Mon, 25 Mar 2019 10:37:35 +0100 Subject: [PATCH] Move RenderViewObserverHostQt to renderer_host It is the host side of RenderViewObserverQt in the renderer dir, so should be in the renderer_host dir. Change-Id: I497a6442130993237a0b823e7dcdd121bd72355a Reviewed-by: Michal Klocek <michal.klocek@qt.io> --- src/core/core_chromium.pri | 4 ++-- src/core/{ => renderer_host}/render_view_observer_host_qt.cpp | 0 src/core/{ => renderer_host}/render_view_observer_host_qt.h | 0 src/core/web_contents_adapter.cpp | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename src/core/{ => renderer_host}/render_view_observer_host_qt.cpp (100%) rename src/core/{ => renderer_host}/render_view_observer_host_qt.h (100%) diff --git a/src/core/core_chromium.pri b/src/core/core_chromium.pri index f3954a2c9..89fb40864 100644 --- a/src/core/core_chromium.pri +++ b/src/core/core_chromium.pri @@ -108,13 +108,13 @@ SOURCES = \ quota_request_controller_impl.cpp \ register_protocol_handler_request_controller_impl.cpp \ render_view_context_menu_qt.cpp \ - render_view_observer_host_qt.cpp \ render_widget_host_view_qt.cpp \ renderer/content_renderer_client_qt.cpp \ renderer/content_settings_observer_qt.cpp \ renderer/render_frame_observer_qt.cpp \ renderer/render_view_observer_qt.cpp \ renderer/user_resource_controller.cpp \ + renderer_host/render_view_observer_host_qt.cpp \ renderer_host/user_resource_controller_host.cpp \ resource_bundle_qt.cpp \ resource_context_qt.cpp \ @@ -213,7 +213,6 @@ HEADERS = \ register_protocol_handler_request_controller.h \ register_protocol_handler_request_controller_impl.h \ render_view_context_menu_qt.h \ - render_view_observer_host_qt.h \ render_widget_host_view_qt.h \ render_widget_host_view_qt_delegate.h \ renderer/content_renderer_client_qt.h \ @@ -221,6 +220,7 @@ HEADERS = \ renderer/render_frame_observer_qt.h \ renderer/render_view_observer_qt.h \ renderer/user_resource_controller.h \ + renderer_host/render_view_observer_host_qt.h \ renderer_host/user_resource_controller_host.h \ request_controller.h \ resource_context_qt.h \ diff --git a/src/core/render_view_observer_host_qt.cpp b/src/core/renderer_host/render_view_observer_host_qt.cpp similarity index 100% rename from src/core/render_view_observer_host_qt.cpp rename to src/core/renderer_host/render_view_observer_host_qt.cpp diff --git a/src/core/render_view_observer_host_qt.h b/src/core/renderer_host/render_view_observer_host_qt.h similarity index 100% rename from src/core/render_view_observer_host_qt.h rename to src/core/renderer_host/render_view_observer_host_qt.h diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp index 90cd598ab..c4f4591e3 100644 --- a/src/core/web_contents_adapter.cpp +++ b/src/core/web_contents_adapter.cpp @@ -53,7 +53,7 @@ #include "profile_adapter.h" #include "profile_qt.h" #include "qwebenginecallback_p.h" -#include "render_view_observer_host_qt.h" +#include "renderer_host/render_view_observer_host_qt.h" #include "render_widget_host_view_qt.h" #include "type_conversion.h" #include "web_contents_view_qt.h" -- GitLab