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 | 40 |
1 files changed, 20 insertions, 20 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 ff6ba275fcfe..41fbdee1f6d1 100644 --- a/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc +++ b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc @@ -1,6 +1,6 @@ ---- chrome/app/chrome_main_delegate.cc.orig 2021-10-01 01:36:38 UTC +--- chrome/app/chrome_main_delegate.cc.orig 2021-12-31 00:57:19 UTC +++ chrome/app/chrome_main_delegate.cc -@@ -153,15 +153,17 @@ +@@ -155,15 +155,17 @@ #include "v8/include/v8.h" #endif @@ -20,7 +20,7 @@ #if BUILDFLAG(ENABLE_NACL) #include "components/nacl/common/nacl_switches.h" -@@ -265,7 +267,7 @@ void SetUpExtendedCrashReporting(bool is_browser_proce +@@ -267,7 +269,7 @@ void SetUpExtendedCrashReporting(bool is_browser_proce #endif // defined(OS_WIN) @@ -29,7 +29,7 @@ void AdjustLinuxOOMScore(const std::string& process_type) { int score = -1; -@@ -300,7 +302,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty +@@ -302,7 +304,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty if (score > -1) base::AdjustOOMScore(base::GetCurrentProcId(), score); } @@ -38,7 +38,7 @@ // Returns true if this subprocess type needs the ResourceBundle initialized // and resources loaded. -@@ -346,7 +348,7 @@ bool HandleVersionSwitches(const base::CommandLine& co +@@ -348,7 +350,7 @@ bool HandleVersionSwitches(const base::CommandLine& co // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -47,7 +47,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) || -@@ -356,7 +358,7 @@ void HandleHelpSwitches(const base::CommandLine& comma +@@ -358,7 +360,7 @@ void HandleHelpSwitches(const base::CommandLine& comma PLOG(FATAL) << "execlp failed"; } } @@ -56,7 +56,7 @@ #if !defined(OS_MAC) && !defined(OS_ANDROID) void SIGTERMProfilingShutdown(int signal) { -@@ -410,7 +412,7 @@ void InitializeUserDataDir(base::CommandLine* command_ +@@ -412,7 +414,7 @@ void InitializeUserDataDir(base::CommandLine* command_ std::string process_type = command_line->GetSwitchValueASCII(switches::kProcessType); @@ -65,7 +65,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. -@@ -422,7 +424,7 @@ void InitializeUserDataDir(base::CommandLine* command_ +@@ -424,7 +426,7 @@ void InitializeUserDataDir(base::CommandLine* command_ user_data_dir = base::FilePath::FromUTF8Unsafe(user_data_dir_string); } } @@ -74,7 +74,7 @@ #if defined(OS_MAC) policy::path_parser::CheckUserDataDirPolicy(&user_data_dir); #endif // OS_MAC -@@ -493,7 +495,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat +@@ -495,7 +497,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat startup_metric_utils::RecordApplicationStartTime(now); #endif @@ -83,7 +83,7 @@ defined(OS_CHROMEOS) // Record the startup process creation time on supported platforms. On Android // this is recorded in ChromeMainDelegateAndroid. -@@ -673,6 +675,8 @@ void ChromeMainDelegate::PostFieldTrialInitialization( +@@ -679,6 +681,8 @@ void ChromeMainDelegate::PostFieldTrialInitialization( // not always enabled on Linux/ChromeOS. #if defined(OS_LINUX) || defined(OS_CHROMEOS) bool enable_gwp_asan = crash_reporter::IsCrashpadEnabled(); @@ -92,7 +92,7 @@ #else bool enable_gwp_asan = true; #endif -@@ -781,7 +785,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi +@@ -790,7 +794,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi v8_crashpad_support::SetUp(); #endif @@ -101,7 +101,7 @@ if (!crash_reporter::IsCrashpadEnabled()) { breakpad::SetFirstChanceExceptionHandler(v8::TryHandleWebAssemblyTrapPosix); } -@@ -794,7 +798,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi +@@ -803,7 +807,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi } // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -110,7 +110,7 @@ // This will directly exit if the user asked for help. HandleHelpSwitches(command_line); #endif -@@ -1005,7 +1009,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1014,7 +1018,7 @@ void ChromeMainDelegate::PreSandboxStartup() { crash_reporter::InitializeCrashKeys(); @@ -119,7 +119,7 @@ ChromeCrashReporterClient::Create(); #endif -@@ -1018,7 +1022,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1027,7 +1031,7 @@ void ChromeMainDelegate::PreSandboxStartup() { child_process_logging::Init(); #endif #if defined(ARCH_CPU_ARM_FAMILY) && \ @@ -128,7 +128,7 @@ // Create an instance of the CPU class to parse /proc/cpuinfo and cache // cpu_brand info. base::CPU cpu_info; -@@ -1136,7 +1140,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1148,7 +1152,7 @@ void ChromeMainDelegate::PreSandboxStartup() { locale; } @@ -137,7 +137,7 @@ // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != switches::kZygoteProcess) { #if defined(OS_ANDROID) -@@ -1157,7 +1161,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1169,7 +1173,7 @@ void ChromeMainDelegate::PreSandboxStartup() { } #endif // defined(OS_ANDROID) } @@ -146,7 +146,7 @@ #if defined(OS_ANDROID) CHECK_EQ(base::android::GetLibraryProcessType(), -@@ -1177,7 +1181,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1189,7 +1193,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. @@ -155,7 +155,7 @@ AdjustLinuxOOMScore(process_type); #endif #if defined(OS_WIN) -@@ -1219,7 +1223,7 @@ int ChromeMainDelegate::RunProcess( +@@ -1231,7 +1235,7 @@ int ChromeMainDelegate::RunProcess( // This entry is not needed on Linux, where the NaCl loader // process is launched via nacl_helper instead. @@ -164,7 +164,7 @@ {switches::kNaClLoaderProcess, NaClMain}, #else {"<invalid>", nullptr}, // To avoid constant array of size 0 -@@ -1247,7 +1251,7 @@ void ChromeMainDelegate::ProcessExiting(const std::str +@@ -1259,7 +1263,7 @@ void ChromeMainDelegate::ProcessExiting(const std::str #endif // !defined(OS_ANDROID) } @@ -173,7 +173,7 @@ void ChromeMainDelegate::ZygoteStarting( std::vector<std::unique_ptr<content::ZygoteForkDelegate>>* delegates) { #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -1284,7 +1288,7 @@ void ChromeMainDelegate::ZygoteForked() { +@@ -1296,7 +1300,7 @@ void ChromeMainDelegate::ZygoteForked() { crash_keys::SetCrashKeysFromCommandLine(*command_line); } |