From 941851b3ebc6d4da159af244c0ef1338deb46060 Mon Sep 17 00:00:00 2001 From: Nitish Sakhawalkar Date: Mon, 13 May 2019 14:24:39 -0700 Subject: [PATCH] Update for changed APIs Update AllowCertificateError API (https://chromium.googlesource.com/chromium/src/+/c5b8df91d1bfefe72aaef19c61bdef7de79d7eb7) --- atom/browser/api/atom_api_app.cc | 2 +- atom/browser/api/atom_api_app.h | 2 +- atom/browser/api/atom_api_session.cc | 4 ++-- atom/browser/atom_browser_client.cc | 4 ++-- atom/browser/atom_browser_client.h | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/atom/browser/api/atom_api_app.cc b/atom/browser/api/atom_api_app.cc index 0aa2a382599a..9bd0858a2baf 100644 --- a/atom/browser/api/atom_api_app.cc +++ b/atom/browser/api/atom_api_app.cc @@ -723,7 +723,7 @@ void App::AllowCertificateError( int cert_error, const net::SSLInfo& ssl_info, const GURL& request_url, - content::ResourceType resource_type, + bool is_main_frame_request, bool strict_enforcement, bool expired_previous_decision, const base::RepeatingCallback& diff --git a/atom/browser/api/atom_api_app.h b/atom/browser/api/atom_api_app.h index bfbf84d58aa6..0d147f9455a8 100644 --- a/atom/browser/api/atom_api_app.h +++ b/atom/browser/api/atom_api_app.h @@ -130,7 +130,7 @@ class App : public AtomBrowserClient::Delegate, int cert_error, const net::SSLInfo& ssl_info, const GURL& request_url, - content::ResourceType resource_type, + bool is_main_frame_request, bool strict_enforcement, bool expired_previous_decision, const base::RepeatingCallback< diff --git a/atom/browser/api/atom_api_session.cc b/atom/browser/api/atom_api_session.cc index 3e7015e05bb4..aae5e67f741f 100644 --- a/atom/browser/api/atom_api_session.cc +++ b/atom/browser/api/atom_api_session.cc @@ -202,8 +202,8 @@ void DownloadIdCallback(content::DownloadManager* download_manager, uint32_t id) { download_manager->CreateDownloadItem( base::GenerateGUID(), id, path, path, url_chain, GURL(), GURL(), GURL(), - GURL(), mime_type, mime_type, start_time, base::Time(), etag, - last_modified, offset, length, std::string(), + GURL(), base::nullopt, mime_type, mime_type, start_time, base::Time(), + etag, last_modified, offset, length, std::string(), download::DownloadItem::INTERRUPTED, download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS, download::DOWNLOAD_INTERRUPT_REASON_NETWORK_TIMEOUT, false, base::Time(), diff --git a/atom/browser/atom_browser_client.cc b/atom/browser/atom_browser_client.cc index 0f606bd6dc29..027150657ede 100644 --- a/atom/browser/atom_browser_client.cc +++ b/atom/browser/atom_browser_client.cc @@ -557,14 +557,14 @@ void AtomBrowserClient::AllowCertificateError( int cert_error, const net::SSLInfo& ssl_info, const GURL& request_url, - content::ResourceType resource_type, + bool is_main_frame_request, bool strict_enforcement, bool expired_previous_decision, const base::Callback& callback) { if (delegate_) { 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); } } diff --git a/atom/browser/atom_browser_client.h b/atom/browser/atom_browser_client.h index 403102d48136..664d6ccfa03a 100644 --- a/atom/browser/atom_browser_client.h +++ b/atom/browser/atom_browser_client.h @@ -102,7 +102,7 @@ class AtomBrowserClient : public content::ContentBrowserClient, int cert_error, const net::SSLInfo& ssl_info, const GURL& request_url, - content::ResourceType resource_type, + bool is_main_frame_request, bool strict_enforcement, bool expired_previous_decision, const base::Callback&