aboutsummaryrefslogtreecommitdiff
path: root/devel/electron19/files/patch-chrome_browser_chrome__content__browser__client.cc
diff options
context:
space:
mode:
Diffstat (limited to 'devel/electron19/files/patch-chrome_browser_chrome__content__browser__client.cc')
-rw-r--r--devel/electron19/files/patch-chrome_browser_chrome__content__browser__client.cc150
1 files changed, 0 insertions, 150 deletions
diff --git a/devel/electron19/files/patch-chrome_browser_chrome__content__browser__client.cc b/devel/electron19/files/patch-chrome_browser_chrome__content__browser__client.cc
deleted file mode 100644
index 7787607d1172..000000000000
--- a/devel/electron19/files/patch-chrome_browser_chrome__content__browser__client.cc
+++ /dev/null
@@ -1,150 +0,0 @@
---- chrome/browser/chrome_content_browser_client.cc.orig 2022-06-19 00:44:36 UTC
-+++ chrome/browser/chrome_content_browser_client.cc
-@@ -378,7 +378,7 @@
- #include "components/user_manager/user_manager.h"
- #include "services/service_manager/public/mojom/interface_provider_spec.mojom.h"
- #include "storage/browser/file_system/external_mount_points.h"
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/chrome_browser_main_linux.h"
- #elif BUILDFLAG(IS_ANDROID)
- #include "base/android/application_status_listener.h"
-@@ -448,17 +448,17 @@
-
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \
- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
- #include "chrome/browser/browser_switcher/browser_switcher_navigation_throttle.h"
- #endif
-
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "components/crash/core/app/crash_switches.h"
- #include "components/crash/core/app/crashpad.h"
- #endif
-
--#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_BSD)
- #if !BUILDFLAG(IS_ANDROID)
- #include "base/debug/leak_annotations.h"
- #include "components/crash/core/app/breakpad_linux.h"
-@@ -466,12 +466,12 @@
- #include "components/crash/content/browser/crash_handler_host_linux.h"
- #endif
-
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/ui/webui/app_settings/web_app_settings_navigation_throttle.h"
- #endif
-
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
-- BUILDFLAG(IS_CHROMEOS_ASH)
-+ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/enterprise/connectors/device_trust/navigation_throttle.h"
- #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ||
- // BUILDFLAG(IS_CHROMEOS_ASH)
-@@ -493,11 +493,11 @@
-
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h"
- #endif
-
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/chrome_browser_main_extra_parts_linux.h"
- #elif defined(USE_OZONE)
- #include "chrome/browser/chrome_browser_main_extra_parts_ozone.h"
-@@ -889,7 +889,7 @@ blink::mojom::AutoplayPolicy GetAutoplayPolicyForWebCo
- int GetCrashSignalFD(const base::CommandLine& command_line) {
- return crashpad::CrashHandlerHost::Get()->GetDeathSignalSocket();
- }
--#elif BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC)
-+#elif BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_BSD)
- breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost(
- const std::string& process_type) {
- base::FilePath dumps_path;
-@@ -1406,7 +1406,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(
- #elif BUILDFLAG(IS_CHROMEOS_LACROS)
- main_parts = std::make_unique<ChromeBrowserMainPartsLacros>(
- std::move(parameters), &startup_data_);
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
- main_parts = std::make_unique<ChromeBrowserMainPartsLinux>(
- std::move(parameters), &startup_data_);
- #elif BUILDFLAG(IS_ANDROID)
-@@ -1440,7 +1440,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(
- std::make_unique<ChromeBrowserMainExtraPartsViewsLacros>());
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
- main_parts->AddParts(
- std::make_unique<ChromeBrowserMainExtraPartsViewsLinux>());
- #else
-@@ -1457,7 +1457,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(
- main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLacros>());
- #endif
-
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLinux>());
- #elif defined(USE_OZONE)
- main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsOzone>());
-@@ -2206,6 +2206,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
- #elif BUILDFLAG(IS_POSIX)
- #if BUILDFLAG(IS_ANDROID)
- bool enable_crash_reporter = true;
-+#elif BUILDFLAG(IS_BSD)
-+ bool enable_crash_reporter = false;
- #else
- bool enable_crash_reporter = false;
- if (crash_reporter::IsCrashpadEnabled()) {
-@@ -2513,7 +2515,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
- ThreadProfilerConfiguration::Get()->AppendCommandLineSwitchForChildProcess(
- command_line);
-
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
- // TODO(https://crbug.com/1316129): Re-enable for Lacros.
- // Processes may only query perf_event_open with the BPF sandbox disabled.
- if (browser_command_line.HasSwitch(switches::kEnableThreadInstructionCount) &&
-@@ -3903,7 +3905,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
- }
- }
-
--#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_BSD)
- void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
- const base::CommandLine& command_line,
- int child_process_id,
-@@ -4310,14 +4312,14 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
- &throttles);
- }
-
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- MaybeAddThrottle(
- WebAppSettingsNavigationThrottle::MaybeCreateThrottleFor(handle),
- &throttles);
- #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
-- BUILDFLAG(IS_CHROMEOS_ASH)
-+ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
- MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle::
- MaybeCreateThrottleFor(handle),
- &throttles);
-@@ -4350,7 +4352,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
-
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \
- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
- MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle::
- MaybeCreateThrottleFor(handle),