mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update for changed APIs

Browse source 
Update AllowCertificateError API (c5b8df91d1)
This commit is contained in:
Nitish Sakhawalkar 2019-05-13 14:24:39 -07:00
parent 1fa5bf0140
commit 941851b3eb
5 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
atom/browser/api/atom_api_app.cc
View file

@ -723,7 +723,7 @@ void App::AllowCertificateError(
int cert_error, int cert_error,
const net::SSLInfo& ssl_info, const net::SSLInfo& ssl_info,
const GURL& request_url, const GURL& request_url,
content::ResourceType resource_type, bool is_main_frame_request,
bool strict_enforcement, bool strict_enforcement,
bool expired_previous_decision, bool expired_previous_decision,
const base::RepeatingCallback<void(content::CertificateRequestResultType)>& const base::RepeatingCallback<void(content::CertificateRequestResultType)>&

2
atom/browser/api/atom_api_app.h
View file

@ -130,7 +130,7 @@ class App : public AtomBrowserClient::Delegate,
int cert_error, int cert_error,
const net::SSLInfo& ssl_info, const net::SSLInfo& ssl_info,
const GURL& request_url, const GURL& request_url,
content::ResourceType resource_type, bool is_main_frame_request,
bool strict_enforcement, bool strict_enforcement,
bool expired_previous_decision, bool expired_previous_decision,
const base::RepeatingCallback< const base::RepeatingCallback<

4
atom/browser/api/atom_api_session.cc
View file

@ -202,8 +202,8 @@ void DownloadIdCallback(content::DownloadManager* download_manager,
uint32_t id) { uint32_t id) {
download_manager->CreateDownloadItem( download_manager->CreateDownloadItem(
base::GenerateGUID(), id, path, path, url_chain, GURL(), GURL(), GURL(), base::GenerateGUID(), id, path, path, url_chain, GURL(), GURL(), GURL(),
GURL(), mime_type, mime_type, start_time, base::Time(), etag, GURL(), base::nullopt, mime_type, mime_type, start_time, base::Time(),
last_modified, offset, length, std::string(), etag, last_modified, offset, length, std::string(),
download::DownloadItem::INTERRUPTED, download::DownloadItem::INTERRUPTED,
download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS, download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
download::DOWNLOAD_INTERRUPT_REASON_NETWORK_TIMEOUT, false, base::Time(), download::DOWNLOAD_INTERRUPT_REASON_NETWORK_TIMEOUT, false, base::Time(),

4
atom/browser/atom_browser_client.cc
View file

@ -557,14 +557,14 @@ void AtomBrowserClient::AllowCertificateError(
int cert_error, int cert_error,
const net::SSLInfo& ssl_info, const net::SSLInfo& ssl_info,
const GURL& request_url, const GURL& request_url,
content::ResourceType resource_type, bool is_main_frame_request,
bool strict_enforcement, bool strict_enforcement,
bool expired_previous_decision, bool expired_previous_decision,
const base::Callback<void(content::CertificateRequestResultType)>& const base::Callback<void(content::CertificateRequestResultType)>&
callback) { callback) {
if (delegate_) { if (delegate_) {
delegate_->AllowCertificateError( delegate_->AllowCertificateError(
web_contents, cert_error, ssl_info, request_url, resource_type, web_contents, cert_error, ssl_info, request_url, is_main_frame_request,
strict_enforcement, expired_previous_decision, callback); strict_enforcement, expired_previous_decision, callback);
} }
} }

2
atom/browser/atom_browser_client.h
View file

@ -102,7 +102,7 @@ class AtomBrowserClient : public content::ContentBrowserClient,
int cert_error, int cert_error,
const net::SSLInfo& ssl_info, const net::SSLInfo& ssl_info,
const GURL& request_url, const GURL& request_url,
content::ResourceType resource_type, bool is_main_frame_request,
bool strict_enforcement, bool strict_enforcement,
bool expired_previous_decision, bool expired_previous_decision,
const base::Callback<void(content::CertificateRequestResultType)>& const base::Callback<void(content::CertificateRequestResultType)>&