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 | 58 |
1 files changed, 12 insertions, 46 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 f1761d090bbe..c978b28e7c2c 100644 --- a/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc +++ b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc @@ -1,15 +1,6 @@ ---- chrome/app/chrome_main_delegate.cc.orig 2025-08-07 06:57:29 UTC +--- chrome/app/chrome_main_delegate.cc.orig 2025-09-06 10:01:20 UTC +++ chrome/app/chrome_main_delegate.cc -@@ -146,7 +146,7 @@ - #include "components/webui/about/credit_utils.h" - #endif - --#if BUILDFLAG(ENABLE_NACL) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) -+#if BUILDFLAG(ENABLE_NACL) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_BSD) - #include "components/nacl/common/nacl_paths.h" - #include "components/nacl/zygote/nacl_fork_delegate_linux.h" - #endif -@@ -186,17 +186,17 @@ +@@ -179,17 +179,17 @@ #include "v8/include/v8.h" #endif @@ -30,7 +21,7 @@ #include "chrome/browser/policy/policy_path_parser.h" #include "components/crash/core/app/crashpad.h" #endif -@@ -314,7 +314,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty +@@ -294,7 +294,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty // and resources loaded. bool SubprocessNeedsResourceBundle(const std::string& process_type) { return @@ -39,7 +30,7 @@ // The zygote process opens the resources for the renderers. process_type == switches::kZygoteProcess || #endif -@@ -397,7 +397,7 @@ bool HandleVersionSwitches(const base::CommandLine& co +@@ -373,7 +373,7 @@ bool HandleVersionSwitches(const base::CommandLine& co return false; } @@ -48,7 +39,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) || -@@ -409,7 +409,7 @@ void HandleHelpSwitches(const base::CommandLine& comma +@@ -385,7 +385,7 @@ void HandleHelpSwitches(const base::CommandLine& comma } #endif // BUILDFLAG(IS_LINUX) @@ -57,7 +48,7 @@ void SIGTERMProfilingShutdown(int signal) { content::Profiling::Stop(); struct sigaction sigact; -@@ -491,7 +491,7 @@ std::optional<int> AcquireProcessSingleton( +@@ -467,7 +467,7 @@ std::optional<int> AcquireProcessSingleton( // process can be exited. ChromeProcessSingleton::CreateInstance(user_data_dir); @@ -66,7 +57,7 @@ // Read the xdg-activation token and set it in the command line for the // duration of the notification in order to ensure this is propagated to an // already running browser process if it exists. -@@ -569,7 +569,7 @@ void InitializeUserDataDir(base::CommandLine* command_ +@@ -545,7 +545,7 @@ void InitializeUserDataDir(base::CommandLine* command_ std::string process_type = command_line->GetSwitchValueASCII(switches::kProcessType); @@ -75,7 +66,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. -@@ -667,7 +667,7 @@ void RecordMainStartupMetrics(const StartupTimestamps& +@@ -643,7 +643,7 @@ void RecordMainStartupMetrics(const StartupTimestamps& #endif #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ @@ -84,7 +75,7 @@ // Record the startup process creation time on supported platforms. On Android // this is recorded in ChromeMainDelegateAndroid. startup_metric_utils::GetCommon().RecordStartupProcessCreationTime( -@@ -826,7 +826,7 @@ std::optional<int> ChromeMainDelegate::PostEarlyInitia +@@ -802,7 +802,7 @@ std::optional<int> ChromeMainDelegate::PostEarlyInitia #if BUILDFLAG(IS_OZONE) // Initialize Ozone platform and add required feature flags as per platform's // properties. @@ -93,7 +84,7 @@ ui::SetOzonePlatformForLinuxIfNeeded(*base::CommandLine::ForCurrentProcess()); #endif ui::OzonePlatform::PreEarlyInitialization(); -@@ -981,7 +981,7 @@ void ChromeMainDelegate::CommonEarlyInitialization() { +@@ -957,7 +957,7 @@ void ChromeMainDelegate::CommonEarlyInitialization() { const bool is_canary_dev = IsCanaryDev(); const bool emit_crashes = #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -102,7 +93,7 @@ is_canary_dev; #else false; -@@ -1129,7 +1129,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom +@@ -1105,7 +1105,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom return 0; // Got a --credits switch; exit with a success error code. } @@ -111,16 +102,7 @@ // This will directly exit if the user asked for help. HandleHelpSwitches(command_line); #endif -@@ -1154,7 +1154,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom - ash::RegisterPathProvider(); - chromeos::dbus_paths::RegisterPathProvider(); - #endif --#if BUILDFLAG(ENABLE_NACL) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) -+#if BUILDFLAG(ENABLE_NACL) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) - nacl::RegisterPathProvider(); - #endif - -@@ -1445,7 +1445,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1409,7 +1409,7 @@ void ChromeMainDelegate::PreSandboxStartup() { CHECK(!loaded_locale.empty()) << "Locale could not be found for " << locale; } @@ -129,19 +111,3 @@ // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != switches::kZygoteProcess && !command_line.HasSwitch(switches::kDisableCrashpadForTesting)) { -@@ -1533,13 +1533,13 @@ std::variant<int, content::MainFunctionParams> ChromeM - #else - - #if BUILDFLAG(IS_MAC) || (BUILDFLAG(ENABLE_NACL) && !BUILDFLAG(IS_LINUX) && \ -- !BUILDFLAG(IS_CHROMEOS)) -+ !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD)) - static const MainFunction kMainFunctions[] = { - #if BUILDFLAG(IS_MAC) - {switches::kRelauncherProcess, mac_relauncher::internal::RelauncherMain}, - {switches::kCodeSignCloneCleanupProcess, - code_sign_clone_manager::internal::ChromeCodeSignCloneCleanupMain}, --#elif BUILDFLAG(ENABLE_NACL) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) -+#elif BUILDFLAG(ENABLE_NACL) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD) - // This entry is not needed on Linux, where the NaCl loader - // process is launched via nacl_helper instead. - {switches::kNaClLoaderProcess, NaClMain}, |