github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

chore: bump chromium to 5b340c815ce15ab2efcf277ed19e9 (master) (#22064)

Browse Source 
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com>
Co-authored-by: loc <andy@slack-corp.com>
Co-authored-by: Robo <hop2deep@gmail.com>
Co-authored-by: Jeremy Apthorp <nornagon@nornagon.net>
This commit is contained in:
Electron Bot
2020-03-03 13:35:05 -08:00
committed by GitHub
parent 3a331ffca6
commit 39baf68790
126 changed files with 1047 additions and 961 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
shell/app/electron_content_client.cc
View File

@@ -233,8 +233,6 @@ base::RefCountedMemory* ElectronContentClient::GetDataResourceBytes(
void ElectronContentClient::AddAdditionalSchemes(Schemes* schemes) {
AppendDelimitedSwitchToVector(switches::kServiceWorkerSchemes,
&schemes->service_worker_schemes);
AppendDelimitedSwitchToVector(switches::kStandardSchemes,
&schemes->standard_schemes);
AppendDelimitedSwitchToVector(switches::kSecureSchemes,
&schemes->secure_schemes);
AppendDelimitedSwitchToVector(switches::kBypassCSPSchemes,

11
shell/app/electron_main_delegate.cc
View File

@@ -342,15 +342,12 @@ int ElectronMainDelegate::RunProcess(
return -1;
}
#if defined(OS_MACOSX)
bool ElectronMainDelegate::DelaySandboxInitialization(
const std::string& process_type) {
return process_type == kRelauncherProcess;
}
#endif
bool ElectronMainDelegate::ShouldCreateFeatureList() {
return false;
}
bool ElectronMainDelegate::ShouldLockSchemeRegistry() {
return false;
}
} // namespace electron

4
shell/app/electron_main_delegate.h
View File

@@ -39,10 +39,8 @@ class ElectronMainDelegate : public content::ContentMainDelegate {
int RunProcess(
const std::string& process_type,
const content::MainFunctionParams& main_function_params) override;
#if defined(OS_MACOSX)
bool DelaySandboxInitialization(const std::string& process_type) override;
#endif
bool ShouldCreateFeatureList() override;
bool ShouldLockSchemeRegistry() override;
private:
#if defined(OS_MACOSX)