1 files changed, 12 insertions, 9 deletions
diff --git a/src/webengine/api/qquickwebengineprofile_p.h b/src/webengine/api/qquickwebengineprofile_p.h
index 61968bf77..d31ded0ec 100644
--- a/src/webengine/api/qquickwebengineprofile_p.h
+++ b/src/webengine/api/qquickwebengineprofile_p.h
@@ -51,9 +51,8 @@
 // We mean it.
 //
 
-#include "browser_context_adapter_client.h"
-#include "browser_context_adapter.h"
-#include "qwebenginebrowsercontext_p.h"
+#include "profile_adapter_client.h"
+#include "profile_adapter.h"
 #include "qquickwebengineprofile_p.h"
 
 #include <QExplicitlySharedDataPointer>
@@ -65,15 +64,18 @@ QT_BEGIN_NAMESPACE
 
 class QQuickWebEngineDownloadItem;
 class QQuickWebEngineSettings;
+class QQuickWebEngineViewPrivate;
 
-class QQuickWebEngineProfilePrivate : public QtWebEngineCore::BrowserContextAdapterClient {
+class QQuickWebEngineProfilePrivate : public QtWebEngineCore::ProfileAdapterClient {
 public:
     Q_DECLARE_PUBLIC(QQuickWebEngineProfile)
-    QQuickWebEngineProfilePrivate(QSharedPointer<QtWebEngineCore::BrowserContextAdapter> browserContext);
+    QQuickWebEngineProfilePrivate(QtWebEngineCore::ProfileAdapter *profileAdapter);
     ~QQuickWebEngineProfilePrivate();
+    void addWebContentsAdapterClient(QQuickWebEngineViewPrivate *adapter);
+    void removeWebContentsAdapterClient(QQuickWebEngineViewPrivate *adapter);
 
-    QSharedPointer<QtWebEngineCore::BrowserContextAdapter> browserContext() const;
-    QQuickWebEngineSettings *settings() const { return m_settings.data(); }
+    QtWebEngineCore::ProfileAdapter* profileAdapter() const;
+    QQuickWebEngineSettings *settings() const;
 
     void cancelDownload(quint32 downloadId);
     void downloadDestroyed(quint32 downloadId);
@@ -88,12 +90,13 @@ public:
     static void userScripts_clear(QQmlListProperty<QQuickWebEngineScript> *p);
 
 private:
-    friend class QQuickWebEngineViewPrivate;
+    friend class QQuickWebEngineView;
     QQuickWebEngineProfile *q_ptr;
     QScopedPointer<QQuickWebEngineSettings> m_settings;
-    QPointer<QWebEngineBrowserContext> m_browserContext;
+    QPointer<QtWebEngineCore::ProfileAdapter> m_profileAdapter;
     QMap<quint32, QPointer<QQuickWebEngineDownloadItem> > m_ongoingDownloads;
     QList<QQuickWebEngineScript *> m_userScripts;
+    QVector<QQuickWebEngineViewPrivate *> m_webContentsAdapterClients;
 };
 
 QT_END_NAMESPACE