diff options
Diffstat (limited to 'devel/electron33/files/patch-chrome_browser_chrome__content__browser__client.cc')
-rw-r--r-- | devel/electron33/files/patch-chrome_browser_chrome__content__browser__client.cc | 171 |
1 files changed, 0 insertions, 171 deletions
diff --git a/devel/electron33/files/patch-chrome_browser_chrome__content__browser__client.cc b/devel/electron33/files/patch-chrome_browser_chrome__content__browser__client.cc deleted file mode 100644 index 74579f7270ec..000000000000 --- a/devel/electron33/files/patch-chrome_browser_chrome__content__browser__client.cc +++ /dev/null @@ -1,171 +0,0 @@ ---- chrome/browser/chrome_content_browser_client.cc.orig 2024-10-16 21:30:57 UTC -+++ chrome/browser/chrome_content_browser_client.cc -@@ -491,7 +491,7 @@ - #include "storage/browser/file_system/external_mount_points.h" - // TODO(crbug.com/40118868): 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) - #include "chrome/browser/chrome_browser_main_linux.h" - #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h" - #elif BUILDFLAG(IS_ANDROID) -@@ -608,12 +608,12 @@ - - // TODO(crbug.com/40118868): 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 -@@ -624,7 +624,7 @@ - #include "chrome/browser/apps/link_capturing/web_app_link_capturing_delegate.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/enterprise/chrome_browser_main_extra_parts_enterprise.h" - #include "chrome/browser/enterprise/profile_management/oidc_auth_response_capture_navigation_throttle.h" - #include "chrome/browser/enterprise/profile_management/profile_management_navigation_throttle.h" -@@ -632,7 +632,7 @@ - #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) -@@ -647,7 +647,7 @@ - #include "chrome/browser/ui/views/lens/lens_side_panel_navigation_helper.h" - #endif - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - #include "chrome/browser/chrome_browser_main_extra_parts_linux.h" - #elif BUILDFLAG(IS_OZONE) - #include "chrome/browser/chrome_browser_main_extra_parts_ozone.h" -@@ -1603,7 +1603,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre - #if BUILDFLAG(IS_CHROMEOS) - registry->RegisterBooleanPref(prefs::kNativeClientForceAllowed, false); - #endif // BUILDFLAG(IS_CHROMEOS) --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - registry->RegisterBooleanPref(prefs::kOutOfProcessSystemDnsResolutionEnabled, - true); - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) -@@ -1803,7 +1803,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo - #elif BUILDFLAG(IS_CHROMEOS_LACROS) - main_parts = std::make_unique<ChromeBrowserMainPartsLacros>( - is_integration_test, &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>( - is_integration_test, &startup_data_); - #elif BUILDFLAG(IS_ANDROID) -@@ -1837,7 +1837,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo - std::make_unique<ChromeBrowserMainExtraPartsViewsLacros>()); - // TODO(crbug.com/40118868): 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 -@@ -1858,7 +1858,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo - 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 BUILDFLAG(IS_OZONE) - main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsOzone>()); -@@ -1877,7 +1877,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo - - chrome::AddMetricsExtraParts(main_parts.get()); - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - main_parts->AddParts( - std::make_unique< - enterprise_util::ChromeBrowserMainExtraPartsEnterprise>()); -@@ -2749,7 +2749,9 @@ void ChromeContentBrowserClient::AppendExtraCommandLin - void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( - base::CommandLine* command_line, - int child_process_id) { -+#ifdef notyet - crash_keys::AppendStringAnnotationsCommandLineSwitch(command_line); -+#endif - #if BUILDFLAG(IS_MAC) - std::unique_ptr<metrics::ClientInfo> client_info = - GoogleUpdateSettings::LoadMetricsClientInfo(); -@@ -2758,7 +2760,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin - client_info->client_id); - } - #elif BUILDFLAG(IS_POSIX) --#if !BUILDFLAG(IS_ANDROID) -+#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_BSD) - pid_t pid; - if (crash_reporter::GetHandlerSocket(nullptr, &pid)) { - command_line->AppendSwitchASCII( -@@ -3117,7 +3119,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin - } - } - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && !BUILDFLAG(IS_BSD) - // Opt into a hardened stack canary mitigation if it hasn't already been - // force-disabled. - if (!browser_command_line.HasSwitch(switches::kChangeStackGuardOnFork)) { -@@ -4941,7 +4943,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, -@@ -5530,7 +5532,7 @@ 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); -@@ -5544,7 +5546,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati - #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); -@@ -5583,7 +5585,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati - handle)); - } - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle:: - MaybeCreateThrottleFor(handle), - &throttles); -@@ -7543,7 +7545,7 @@ bool ChromeContentBrowserClient::ShouldRunOutOfProcess - bool ChromeContentBrowserClient::ShouldRunOutOfProcessSystemDnsResolution() { - // This enterprise policy is supported on Android, but the feature will not be - // launched there. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - // This is possibly called before `g_browser_process` is initialized. - PrefService* local_state; - if (g_browser_process) { |