Merge branch '5.15' into dev

Last commits before 87 update.

Change-Id: Id156b0199a8fd354c946cfe604ae8541ba554658

1 files changed, 2 insertions, 2 deletions

diff --git a/src/core/web_contents_adapter.h b/src/core/web_contents_adapter.h
index acf65f4d5..941a815c0 100644
--- a/src/core/web_contents_adapter.h
+++ b/src/core/web_contents_adapter.h
@@ -91,7 +91,7 @@ class FaviconManager;
 class FindTextHelper;
 class MessagePassingInterface;
 class ProfileQt;
-class RenderViewObserverHostQt;
+class WebEnginePageHost;
 class WebChannelIPCTransportHost;
 class WebEngineContext;
 
@@ -262,7 +262,7 @@ private:
     ProfileAdapter *m_profileAdapter;
     std::unique_ptr<content::WebContents> m_webContents;
     std::unique_ptr<WebContentsDelegateQt> m_webContentsDelegate;
-    std::unique_ptr<RenderViewObserverHostQt> m_renderViewObserverHost;
+    std::unique_ptr<WebEnginePageHost> m_pageHost;
 #if QT_CONFIG(webengine_webchannel)
     std::unique_ptr<WebChannelIPCTransportHost> m_webChannelTransport;
     QWebChannel *m_webChannel;