--- electron/shell/app/electron_main_delegate.cc.orig 2026-05-01 21:06:40 UTC +++ electron/shell/app/electron_main_delegate.cc @@ -67,7 +67,7 @@ #include "chrome/child/v8_crashpad_support_win.h" #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "base/nix/xdg_util.h" #include "base/posix/global_descriptors.h" #include "content/public/common/content_descriptors.h" @@ -75,7 +75,7 @@ #include "v8/include/v8.h" #endif -#if !IS_MAS_BUILD() +#if !IS_MAS_BUILD() && !BUILDFLAG(IS_BSD) #include "components/crash/core/app/crash_switches.h" // nogncheck #include "components/crash/core/app/crashpad.h" // nogncheck #include "components/crash/core/common/crash_key.h" @@ -215,7 +215,7 @@ std::optional ElectronMainDelegate::BasicStartupC base::win::PinUser32(); #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Check for --no-sandbox parameter when running as root. if (getuid() == 0 && IsSandboxEnabled(command_line)) LOG(FATAL) << "Running as root without --" @@ -245,7 +245,7 @@ void ElectronMainDelegate::PreSandboxStartup() { auto* command_line = base::CommandLine::ForCurrentProcess(); std::string process_type = GetProcessType(); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Register the pseudonymization salt descriptor in GlobalDescriptors. // (see https://crbug.com/40850085) Only affects processes launched // without the zygote (i.e. utility processes) @@ -279,7 +279,7 @@ void ElectronMainDelegate::PreSandboxStartup() { /* is_preinit = */ IsBrowserProcess() || IsZygoteProcess()); #endif -#if !IS_MAS_BUILD() +#if !IS_MAS_BUILD() && !BUILDFLAG(IS_BSD) crash_reporter::InitializeCrashKeys(); #endif @@ -314,7 +314,7 @@ void ElectronMainDelegate::PreSandboxStartup() { } #endif -#if !IS_MAS_BUILD() +#if !IS_MAS_BUILD() && !BUILDFLAG(IS_BSD) crash_keys::SetCrashKeysFromCommandLine(*command_line); crash_keys::SetPlatformCrashKey(); #endif @@ -354,7 +354,7 @@ std::optional ElectronMainDelegate::PreBrowserMai #if BUILDFLAG(IS_MAC) RegisterAtomCrApp(); #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Set the global activation token sent as an environment variable. auto env = base::Environment::Create(); base::nix::ExtractXdgActivationTokenFromEnv(*env);