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.cpp | |
| 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.cpp')
| -rw-r--r-- | src/core/browser_context_qt.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/core/browser_context_qt.cpp b/src/core/browser_context_qt.cpp index de6c06dd7..5685c2dcd 100644 --- a/src/core/browser_context_qt.cpp +++ b/src/core/browser_context_qt.cpp @@ -44,6 +44,7 @@ #include "permission_manager_qt.h" #include "qtwebenginecoreglobal_p.h" #include "resource_context_qt.h" +#include "ssl_host_state_delegate_qt.h" #include "type_conversion.h" #include "url_request_context_getter_qt.h" @@ -172,7 +173,9 @@ content::PushMessagingService *BrowserContextQt::GetPushMessagingService() content::SSLHostStateDelegate* BrowserContextQt::GetSSLHostStateDelegate() { - return 0; + if (!sslHostStateDelegate) + sslHostStateDelegate.reset(new SSLHostStateDelegateQt(m_adapter)); + return sslHostStateDelegate.get(); } scoped_ptr<content::ZoomLevelDelegate> BrowserContextQt::CreateZoomLevelDelegate(const base::FilePath&) |