From fb55db665cb9b6f8ad37c632d7ed386fd1cb0510 Mon Sep 17 00:00:00 2001 From: Samuel Attard Date: Mon, 18 Dec 2017 11:13:03 +1100 Subject: [PATCH] AllowCertificateError no longer sends overridable --- atom/browser/api/atom_api_app.cc | 1 - atom/browser/api/atom_api_app.h | 1 - atom/browser/atom_browser_client.cc | 3 +-- atom/browser/atom_browser_client.h | 1 - 4 files changed, 1 insertion(+), 5 deletions(-) diff --git a/atom/browser/api/atom_api_app.cc b/atom/browser/api/atom_api_app.cc index 7711211356..4a496ef3f9 100644 --- a/atom/browser/api/atom_api_app.cc +++ b/atom/browser/api/atom_api_app.cc @@ -702,7 +702,6 @@ void App::AllowCertificateError( const net::SSLInfo& ssl_info, const GURL& request_url, content::ResourceType resource_type, - bool overridable, bool strict_enforcement, bool expired_previous_decision, const base::Callback& diff --git a/atom/browser/api/atom_api_app.h b/atom/browser/api/atom_api_app.h index cf7641c213..59d1e31c14 100644 --- a/atom/browser/api/atom_api_app.h +++ b/atom/browser/api/atom_api_app.h @@ -133,7 +133,6 @@ class App : public AtomBrowserClient::Delegate, const net::SSLInfo& ssl_info, const GURL& request_url, content::ResourceType resource_type, - bool overridable, bool strict_enforcement, bool expired_previous_decision, const base::Callback& diff --git a/atom/browser/atom_browser_client.cc b/atom/browser/atom_browser_client.cc index b8a844a688..437be4aec4 100644 --- a/atom/browser/atom_browser_client.cc +++ b/atom/browser/atom_browser_client.cc @@ -348,7 +348,6 @@ void AtomBrowserClient::AllowCertificateError( const net::SSLInfo& ssl_info, const GURL& request_url, content::ResourceType resource_type, - bool overridable, bool strict_enforcement, bool expired_previous_decision, const base::Callback& @@ -356,7 +355,7 @@ void AtomBrowserClient::AllowCertificateError( if (delegate_) { delegate_->AllowCertificateError( web_contents, cert_error, ssl_info, request_url, - resource_type, overridable, strict_enforcement, + resource_type, strict_enforcement, expired_previous_decision, callback); } } diff --git a/atom/browser/atom_browser_client.h b/atom/browser/atom_browser_client.h index 95afc70b58..046641df50 100644 --- a/atom/browser/atom_browser_client.h +++ b/atom/browser/atom_browser_client.h @@ -69,7 +69,6 @@ class AtomBrowserClient : public brightray::BrowserClient, const net::SSLInfo& ssl_info, const GURL& request_url, content::ResourceType resource_type, - bool overridable, bool strict_enforcement, bool expired_previous_decision, const base::Callback&