diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-03-08 10:40:49 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-03-08 10:40:49 +0100 |
| commit | ccf12049b662fe1b03b5b0ea199d29b32f072eda (patch) | |
| tree | 43e3d0042eb1f8ba23349e10c9c7e547fab57fec /src/core/browser_context_qt.h | |
| parent | 56714be7d05afb94c63b658a4fdb2bedd1bee645 (diff) | |
| parent | 471d484bea6b8b84749b8d89c603cb8394f1b5ee (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: Ieab3c4a6d16b1d7b7c0243ff8898f81807e7b1fc
Diffstat (limited to 'src/core/browser_context_qt.h')
| -rw-r--r-- | src/core/browser_context_qt.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/core/browser_context_qt.h b/src/core/browser_context_qt.h index 044a3adac..08ac05fd4 100644 --- a/src/core/browser_context_qt.h +++ b/src/core/browser_context_qt.h @@ -59,6 +59,7 @@ namespace QtWebEngineCore { class BrowserContextAdapter; class PermissionManagerQt; +class SSLHostStateDelegateQt; class URLRequestContextGetterQt; class BrowserContextQt : public content::BrowserContext @@ -104,6 +105,7 @@ private: scoped_ptr<content::ResourceContext> resourceContext; scoped_refptr<URLRequestContextGetterQt> url_request_getter_; scoped_ptr<PermissionManagerQt> permissionManager; + scoped_ptr<SSLHostStateDelegateQt> sslHostStateDelegate; BrowserContextAdapter *m_adapter; #if defined(ENABLE_SPELLCHECK) scoped_refptr<TestingPrefStore> m_prefStore; |