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

chore: bump chromium to 54af93edd956a53c786668bc0e253 (master)

Browse source
This commit is contained in:
Jeremy Apthorp 2019-05-23 13:35:41 -07:00 • committed by GitHub
commit 53954494a9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
104 changed files with 538 additions and 567 deletions
Download patch file Download diff file Expand all files Collapse all files

8
atom/browser/atom_browser_client.cc
View file

@ -501,7 +501,7 @@ void AtomBrowserClient::AppendExtraCommandLineSwitches(
content::WebContents* web_contents = GetWebContentsFromProcessID(process_id);
if (web_contents) {
if (web_contents->GetVisibleURL().SchemeIs("chrome-devtools")) {
if (web_contents->GetVisibleURL().SchemeIs("devtools")) {
command_line->AppendSwitch(switches::kDisableRemoteModule);
}
auto* web_preferences = WebContentsPreferences::From(web_contents);
@ -558,14 +558,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<void(content::CertificateRequestResultType)>&
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);
}
}
@ -828,8 +828,6 @@ bool AtomBrowserClient::HandleExternalProtocol(
bool is_main_frame,
ui::PageTransition page_transition,
bool has_user_gesture,
const std::string& method,
const net::HttpRequestHeaders& headers,
network::mojom::URLLoaderFactoryRequest* factory_request,
// clang-format off
network::mojom::URLLoaderFactory*& out_factory) { // NOLINT