diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-03-11 10:25:38 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-03-11 10:25:38 +0000 |
commit | c305cc06c74cb95ef2ddfacee0ede1d82e3dbb3c (patch) | |
tree | e09e2ccbc9bda8f46737c89e8b2297061d6daade /src/core/browser_context_qt.cpp | |
parent | f658dcb0893e7869cc0c029bfe0be82838af4bb8 (diff) | |
parent | ccf12049b662fe1b03b5b0ea199d29b32f072eda (diff) |
Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7
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&) |