diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-01-25 15:09:31 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-03-01 12:06:20 +0000 |
| commit | ab94349cb2fa073e8aec661a797de1cfc3819752 (patch) | |
| tree | d3525f63aa9b3ff041989d5cf981e0ee8b07d77d /src/core/content_browser_client_qt.cpp | |
| parent | cb6564b11ea0a81155b59ab178ff75148017a952 (diff) | |
Simple adaptations to Chromium 55
The simplest adaptations to API and build changes in Chromium 55
Change-Id: I923fa188690a04902492317807f72f006bcab9c6
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'src/core/content_browser_client_qt.cpp')
| -rw-r--r-- | src/core/content_browser_client_qt.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/core/content_browser_client_qt.cpp b/src/core/content_browser_client_qt.cpp index f9b6f31d8..71e83a578 100644 --- a/src/core/content_browser_client_qt.cpp +++ b/src/core/content_browser_client_qt.cpp @@ -469,17 +469,12 @@ void ContentBrowserClientQt::AllowCertificateError(content::WebContents *webCont bool overridable, bool strict_enforcement, bool expired_previous_decision, - const base::Callback<void(bool)>& callback, - content::CertificateRequestResultType* result) + const base::Callback<void(content::CertificateRequestResultType)>& callback) { WebContentsDelegateQt* contentsDelegate = static_cast<WebContentsDelegateQt*>(webContents->GetDelegate()); QSharedPointer<CertificateErrorController> errorController(new CertificateErrorController(new CertificateErrorControllerPrivate(cert_error, ssl_info, request_url, resource_type, overridable, strict_enforcement, callback))); contentsDelegate->allowCertificateError(errorController); - - // If we don't give the user a chance to allow it, we can reject it right away. - if (result && (!overridable || strict_enforcement)) - *result = content::CERTIFICATE_REQUEST_RESULT_TYPE_DENY; } void ContentBrowserClientQt::SelectClientCertificate(content::WebContents * /*webContents*/, |