diff options
Diffstat (limited to 'www/chromium/files/patch-chrome_app_chrome__main__delegate.cc')
| -rw-r--r-- | www/chromium/files/patch-chrome_app_chrome__main__delegate.cc | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc index aa0cbdac9e82..d5cd6768995a 100644 --- a/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc +++ b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc @@ -1,4 +1,4 @@ ---- chrome/app/chrome_main_delegate.cc.orig 2020-07-07 21:58:12 UTC +--- chrome/app/chrome_main_delegate.cc.orig 2020-09-08 19:13:58 UTC +++ chrome/app/chrome_main_delegate.cc @@ -107,7 +107,7 @@ #include "chrome/app/shutdown_signal_handlers_posix.h" @@ -9,7 +9,7 @@ #include "components/nacl/common/nacl_paths.h" #include "components/nacl/zygote/nacl_fork_delegate_linux.h" #endif -@@ -144,12 +144,12 @@ +@@ -145,12 +145,12 @@ #include "v8/include/v8.h" #endif @@ -24,7 +24,7 @@ #include "chrome/browser/policy/policy_path_parser.h" #include "components/crash/core/app/crashpad.h" #endif -@@ -266,7 +266,7 @@ void SetUpExtendedCrashReporting(bool is_browser_proce +@@ -267,7 +267,7 @@ void SetUpExtendedCrashReporting(bool is_browser_proce #endif // defined(OS_WIN) @@ -33,7 +33,7 @@ void AdjustLinuxOOMScore(const std::string& process_type) { int score = -1; -@@ -306,13 +306,13 @@ void AdjustLinuxOOMScore(const std::string& process_ty +@@ -307,13 +307,13 @@ void AdjustLinuxOOMScore(const std::string& process_ty if (score > -1) base::AdjustOOMScore(base::GetCurrentProcId(), score); } @@ -49,7 +49,7 @@ // The zygote process opens the resources for the renderers. process_type == service_manager::switches::kZygoteProcess || #endif -@@ -351,7 +351,7 @@ bool HandleVersionSwitches(const base::CommandLine& co +@@ -352,7 +352,7 @@ bool HandleVersionSwitches(const base::CommandLine& co return false; } @@ -58,7 +58,7 @@ // Show the man page if --help or -h is on the command line. void HandleHelpSwitches(const base::CommandLine& command_line) { if (command_line.HasSwitch(switches::kHelp) || -@@ -361,7 +361,7 @@ void HandleHelpSwitches(const base::CommandLine& comma +@@ -362,7 +362,7 @@ void HandleHelpSwitches(const base::CommandLine& comma PLOG(FATAL) << "execlp failed"; } } @@ -67,7 +67,7 @@ #if !defined(OS_MACOSX) && !defined(OS_ANDROID) void SIGTERMProfilingShutdown(int signal) { -@@ -415,7 +415,7 @@ void InitializeUserDataDir(base::CommandLine* command_ +@@ -416,7 +416,7 @@ void InitializeUserDataDir(base::CommandLine* command_ std::string process_type = command_line->GetSwitchValueASCII(switches::kProcessType); @@ -76,7 +76,7 @@ // On Linux, Chrome does not support running multiple copies under different // DISPLAYs, so the profile directory can be specified in the environment to // support the virtual desktop use-case. -@@ -427,7 +427,7 @@ void InitializeUserDataDir(base::CommandLine* command_ +@@ -428,7 +428,7 @@ void InitializeUserDataDir(base::CommandLine* command_ user_data_dir = base::FilePath::FromUTF8Unsafe(user_data_dir_string); } } @@ -85,7 +85,7 @@ #if defined(OS_MACOSX) policy::path_parser::CheckUserDataDirPolicy(&user_data_dir); #endif // OS_MAC -@@ -498,7 +498,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat +@@ -499,7 +499,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat startup_metric_utils::RecordApplicationStartTime(now); #endif @@ -94,7 +94,7 @@ // Record the startup process creation time on supported platforms. startup_metric_utils::RecordStartupProcessCreationTime( base::Process::Current().CreationTime()); -@@ -691,7 +691,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi +@@ -693,7 +693,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi v8_crashpad_support::SetUp(); #endif @@ -103,7 +103,7 @@ if (!crash_reporter::IsCrashpadEnabled()) { breakpad::SetFirstChanceExceptionHandler(v8::TryHandleWebAssemblyTrapPosix); } -@@ -702,7 +702,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi +@@ -704,7 +704,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi *exit_code = 0; return true; // Got a --version switch; exit with a success error code. } @@ -112,7 +112,7 @@ // This will directly exit if the user asked for help. HandleHelpSwitches(command_line); #endif -@@ -726,7 +726,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi +@@ -728,7 +728,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi #if defined(OS_CHROMEOS) chromeos::RegisterPathProvider(); #endif @@ -121,7 +121,7 @@ nacl::RegisterPathProvider(); #endif -@@ -906,7 +906,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -908,7 +908,7 @@ void ChromeMainDelegate::PreSandboxStartup() { crash_reporter::InitializeCrashKeys(); @@ -130,7 +130,7 @@ ChromeCrashReporterClient::Create(); #endif -@@ -918,7 +918,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -920,7 +920,7 @@ void ChromeMainDelegate::PreSandboxStartup() { #if defined(OS_WIN) child_process_logging::Init(); #endif @@ -139,7 +139,7 @@ // Create an instance of the CPU class to parse /proc/cpuinfo and cache // cpu_brand info. base::CPU cpu_info; -@@ -1037,7 +1037,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1039,7 +1039,7 @@ void ChromeMainDelegate::PreSandboxStartup() { locale; } @@ -148,16 +148,16 @@ // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != service_manager::switches::kZygoteProcess) { #if defined(OS_ANDROID) -@@ -1058,7 +1058,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1060,7 +1060,7 @@ void ChromeMainDelegate::PreSandboxStartup() { } #endif // defined(OS_ANDROID) } -#endif // defined(OS_POSIX) && !defined(OS_MACOSX) +#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) - // After all the platform Breakpads have been initialized, store the command - // line for crash reporting. -@@ -1072,7 +1072,7 @@ void ChromeMainDelegate::PreSandboxStartup() { + #if defined(OS_ANDROID) + CHECK_EQ(base::android::GetLibraryProcessType(), +@@ -1080,7 +1080,7 @@ void ChromeMainDelegate::PreSandboxStartup() { void ChromeMainDelegate::SandboxInitialized(const std::string& process_type) { // Note: If you are adding a new process type below, be sure to adjust the // AdjustLinuxOOMScore function too. @@ -166,7 +166,7 @@ AdjustLinuxOOMScore(process_type); #endif #if defined(OS_WIN) -@@ -1114,7 +1114,7 @@ int ChromeMainDelegate::RunProcess( +@@ -1122,7 +1122,7 @@ int ChromeMainDelegate::RunProcess( // This entry is not needed on Linux, where the NaCl loader // process is launched via nacl_helper instead. @@ -175,16 +175,16 @@ {switches::kNaClLoaderProcess, NaClMain}, #else {"<invalid>", nullptr}, // To avoid constant array of size 0 -@@ -1142,7 +1142,7 @@ void ChromeMainDelegate::ProcessExiting(const std::str +@@ -1150,7 +1150,7 @@ void ChromeMainDelegate::ProcessExiting(const std::str #endif // !defined(OS_ANDROID) } -#if defined(OS_LINUX) +#if defined(OS_LINUX) && !defined(OS_BSD) void ChromeMainDelegate::ZygoteStarting( - std::vector<std::unique_ptr<service_manager::ZygoteForkDelegate>>* - delegates) { -@@ -1180,7 +1180,7 @@ void ChromeMainDelegate::ZygoteForked() { + std::vector<std::unique_ptr<content::ZygoteForkDelegate>>* delegates) { + #if defined(OS_CHROMEOS) +@@ -1187,7 +1187,7 @@ void ChromeMainDelegate::ZygoteForked() { crash_keys::SetCrashKeysFromCommandLine(*command_line); } |