ports/www/iridium/files/patch-chrome_app_chrome__main__delegate.cc
Carlos J. Puga Medina 66d46c9897 www/iridium: Update to 2019.04.73
Submitted by:	Matthias Wolf <matthias@rheinwolf.de>
2019-06-18 19:24:43 +00:00

128 lines
5.1 KiB
C++

--- chrome/app/chrome_main_delegate.cc.orig 2019-03-11 22:00:52 UTC
+++ chrome/app/chrome_main_delegate.cc
@@ -101,7 +101,7 @@
#include "chrome/app/shutdown_signal_handlers_posix.h"
#endif
-#if BUILDFLAG(ENABLE_NACL) && defined(OS_LINUX)
+#if BUILDFLAG(ENABLE_NACL) && defined(OS_LINUX) && !defined(OS_BSD)
#include "components/nacl/common/nacl_paths.h"
#include "components/nacl/zygote/nacl_fork_delegate_linux.h"
#endif
@@ -135,7 +135,7 @@
#include "v8/include/v8.h"
#endif
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
#include "base/environment.h"
#endif
@@ -232,7 +232,7 @@ bool UseHooks() {
#endif // defined(OS_WIN)
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) && !defined(OS_BSD)
void AdjustLinuxOOMScore(const std::string& process_type) {
// Browsers and zygotes should still be killable, but killed last.
const int kZygoteScore = 0;
@@ -291,7 +291,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty
if (score > -1)
base::AdjustOOMScore(base::GetCurrentProcId(), score);
}
-#endif // defined(OS_LINUX)
+#endif // defined(OS_LINUX) && !defined(OS_BSD)
// Returns true if this subprocess type needs the ResourceBundle initialized
// and resources loaded.
@@ -336,7 +336,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
return false;
}
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
// 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) ||
@@ -346,7 +346,7 @@ void HandleHelpSwitches(const base::CommandLine& comma
PLOG(FATAL) << "execlp failed";
}
}
-#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#endif // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
#if !defined(OS_MACOSX) && !defined(OS_ANDROID)
void SIGTERMProfilingShutdown(int signal) {
@@ -400,7 +400,7 @@ void InitializeUserDataDir(base::CommandLine* command_
std::string process_type =
command_line->GetSwitchValueASCII(switches::kProcessType);
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
// 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.
@@ -412,7 +412,7 @@ void InitializeUserDataDir(base::CommandLine* command_
user_data_dir = base::FilePath::FromUTF8Unsafe(user_data_dir_string);
}
}
-#endif // OS_LINUX
+#endif // OS_LINUX || OS_BSD
#if defined(OS_MACOSX)
policy::path_parser::CheckUserDataDirPolicy(&user_data_dir);
#endif // OS_MAC
@@ -469,7 +469,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);
-#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX)
+#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
// Record the startup process creation time on supported platforms.
startup_metric_utils::RecordStartupProcessCreationTime(
base::Process::Current().CreationTime());
@@ -596,7 +596,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
*exit_code = 0;
return true; // Got a --version switch; exit with a success error code.
}
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
// This will directly exit if the user asked for help.
HandleHelpSwitches(command_line);
#endif
@@ -620,7 +620,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
#if defined(OS_CHROMEOS)
chromeos::RegisterPathProvider();
#endif
-#if BUILDFLAG(ENABLE_NACL) && defined(OS_LINUX)
+#if BUILDFLAG(ENABLE_NACL) && defined(OS_LINUX) && !defined(OS_BSD)
nacl::RegisterPathProvider();
#endif
@@ -936,7 +936,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
InitializePDF();
#endif
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
// Zygote needs to call InitCrashReporter() in RunZygote().
if (process_type != service_manager::switches::kZygoteProcess) {
#if defined(OS_ANDROID)
@@ -951,7 +951,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
breakpad::InitCrashReporter(process_type);
#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.
@@ -961,7 +961,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.
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) && !defined(OS_BSD)
AdjustLinuxOOMScore(process_type);
#endif
#if defined(OS_WIN)