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 | 28 |
1 files changed, 14 insertions, 14 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 53085731c2fb..c9dd9ec6af2c 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 2019-04-30 22:22:30 UTC +--- chrome/app/chrome_main_delegate.cc.orig 2019-06-04 18:55:16 UTC +++ chrome/app/chrome_main_delegate.cc -@@ -101,7 +101,7 @@ +@@ -100,7 +100,7 @@ #include "chrome/app/shutdown_signal_handlers_posix.h" #endif @@ -18,7 +18,7 @@ #include "base/environment.h" #endif -@@ -238,7 +238,7 @@ bool UseHooks() { +@@ -240,7 +240,7 @@ bool UseHooks() { #endif // defined(OS_WIN) @@ -27,7 +27,7 @@ void AdjustLinuxOOMScore(const std::string& process_type) { // Browsers and zygotes should still be killable, but killed last. const int kZygoteScore = 0; -@@ -297,7 +297,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty +@@ -299,7 +299,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty if (score > -1) base::AdjustOOMScore(base::GetCurrentProcId(), score); } @@ -36,7 +36,7 @@ // Returns true if this subprocess type needs the ResourceBundle initialized // and resources loaded. -@@ -342,7 +342,7 @@ bool HandleVersionSwitches(const base::CommandLine& co +@@ -344,7 +344,7 @@ bool HandleVersionSwitches(const base::CommandLine& co return false; } @@ -45,7 +45,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) || -@@ -352,7 +352,7 @@ void HandleHelpSwitches(const base::CommandLine& comma +@@ -354,7 +354,7 @@ void HandleHelpSwitches(const base::CommandLine& comma PLOG(FATAL) << "execlp failed"; } } @@ -54,7 +54,7 @@ #if !defined(OS_MACOSX) && !defined(OS_ANDROID) void SIGTERMProfilingShutdown(int signal) { -@@ -406,7 +406,7 @@ void InitializeUserDataDir(base::CommandLine* command_ +@@ -408,7 +408,7 @@ void InitializeUserDataDir(base::CommandLine* command_ std::string process_type = command_line->GetSwitchValueASCII(switches::kProcessType); @@ -63,7 +63,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. -@@ -418,7 +418,7 @@ void InitializeUserDataDir(base::CommandLine* command_ +@@ -420,7 +420,7 @@ void InitializeUserDataDir(base::CommandLine* command_ user_data_dir = base::FilePath::FromUTF8Unsafe(user_data_dir_string); } } @@ -72,7 +72,7 @@ #if defined(OS_MACOSX) policy::path_parser::CheckUserDataDirPolicy(&user_data_dir); #endif // OS_MAC -@@ -475,7 +475,7 @@ void InitLogging(const std::string& process_type) { +@@ -477,7 +477,7 @@ void InitLogging(const std::string& process_type) { void RecordMainStartupMetrics(base::TimeTicks exe_entry_point_ticks) { if (!exe_entry_point_ticks.is_null()) startup_metric_utils::RecordExeMainEntryPointTicks(exe_entry_point_ticks); @@ -81,7 +81,7 @@ // Record the startup process creation time on supported platforms. startup_metric_utils::RecordStartupProcessCreationTime( base::Process::Current().CreationTime()); -@@ -613,7 +613,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi +@@ -619,7 +619,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi *exit_code = 0; return true; // Got a --version switch; exit with a success error code. } @@ -90,7 +90,7 @@ // This will directly exit if the user asked for help. HandleHelpSwitches(command_line); #endif -@@ -637,7 +637,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi +@@ -643,7 +643,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi #if defined(OS_CHROMEOS) chromeos::RegisterPathProvider(); #endif @@ -99,7 +99,7 @@ nacl::RegisterPathProvider(); #endif -@@ -953,7 +953,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -965,7 +965,7 @@ void ChromeMainDelegate::PreSandboxStartup() { InitializePDF(); #endif @@ -108,7 +108,7 @@ // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != service_manager::switches::kZygoteProcess) { #if defined(OS_ANDROID) -@@ -968,7 +968,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -980,7 +980,7 @@ void ChromeMainDelegate::PreSandboxStartup() { breakpad::InitCrashReporter(process_type); #endif // defined(OS_ANDROID) } @@ -117,7 +117,7 @@ // After all the platform Breakpads have been initialized, store the command // line for crash reporting. -@@ -978,7 +978,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -990,7 +990,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. |