diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-03-21 14:35:01 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-03-21 14:35:01 +0100 |
commit | 432af50e930b7f11455fc1daec17d9c215ea88ee (patch) | |
tree | 75f8e9cc04069de32c25660298c4fce046f88b4e /src/core/profile_adapter.h | |
parent | 809afc26fe0c47b249cf11376c8ea484a2bfaaf1 (diff) | |
parent | d5a479a720ee76fae9fa7b0f7b6b3d0a61718ff0 (diff) |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: If771fabe97c4d75edc4627999f04f70ca1901060
Diffstat (limited to 'src/core/profile_adapter.h')
-rw-r--r-- | src/core/profile_adapter.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/core/profile_adapter.h b/src/core/profile_adapter.h index 482835010..48094a3d8 100644 --- a/src/core/profile_adapter.h +++ b/src/core/profile_adapter.h @@ -60,6 +60,7 @@ #include <QString> #include <QVector> +#include "api/qwebengineclientcertificatestore.h" #include "api/qwebenginecookiestore.h" #include "api/qwebengineurlrequestinterceptor.h" #include "api/qwebengineurlschemehandler.h" @@ -75,6 +76,7 @@ class ProfileAdapterClient; class ProfileQt; class UserResourceControllerHost; class VisitedLinksManagerQt; +class WebContentsAdapterClient; class QWEBENGINECORE_PRIVATE_EXPORT ProfileAdapter : public QObject { @@ -132,6 +134,9 @@ public: void setSpellCheckEnabled(bool enabled); bool isSpellCheckEnabled() const; + void addWebContentsAdapterClient(WebContentsAdapterClient *client); + void removeWebContentsAdapterClient(WebContentsAdapterClient *client); + // KEEP IN SYNC with API or add mapping layer enum HttpCacheType { MemoryHttpCache = 0, @@ -200,6 +205,10 @@ public: void removePageRequestInterceptor(); bool hasPageRequestInterceptor() const { return m_pageRequestInterceptors > 0; } +#if QT_CONFIG(ssl) + QWebEngineClientCertificateStore *clientCertificateStore(); +#endif + QHash<QByteArray, QWeakPointer<UserNotificationController>> &ephemeralNotifications() { return m_ephemeralNotifications; } QHash<QByteArray, QSharedPointer<UserNotificationController>> &persistentNotifications() @@ -218,6 +227,9 @@ private: QScopedPointer<DownloadManagerDelegateQt> m_downloadManagerDelegate; QScopedPointer<UserResourceControllerHost> m_userResourceController; QScopedPointer<QWebEngineCookieStore> m_cookieStore; +#if QT_CONFIG(ssl) + QWebEngineClientCertificateStore *m_clientCertificateStore = nullptr; +#endif QPointer<QWebEngineUrlRequestInterceptor> m_requestInterceptor; QString m_dataPath; @@ -233,6 +245,7 @@ private: QHash<QByteArray, QSharedPointer<UserNotificationController>> m_persistentNotifications; QList<ProfileAdapterClient*> m_clients; + QVector<WebContentsAdapterClient *> m_webContentsAdapterClients; int m_httpCacheMaxSize; int m_pageRequestInterceptors; QrcUrlSchemeHandler m_qrcHandler; |