diff options
Diffstat (limited to 'devel/electron35/files/patch-chrome_browser_chrome__content__browser__client.cc')
| -rw-r--r-- | devel/electron35/files/patch-chrome_browser_chrome__content__browser__client.cc | 170 |
1 files changed, 0 insertions, 170 deletions
diff --git a/devel/electron35/files/patch-chrome_browser_chrome__content__browser__client.cc b/devel/electron35/files/patch-chrome_browser_chrome__content__browser__client.cc deleted file mode 100644 index 0fdb44e8cd34..000000000000 --- a/devel/electron35/files/patch-chrome_browser_chrome__content__browser__client.cc +++ /dev/null @@ -1,170 +0,0 @@ ---- chrome/browser/chrome_content_browser_client.cc.orig 2025-03-24 20:50:14 UTC -+++ chrome/browser/chrome_content_browser_client.cc -@@ -508,7 +508,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) -+#elif BUILDFLAG(IS_LINUX) || 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) -@@ -620,11 +620,11 @@ - #include "services/network/public/mojom/permissions_policy/permissions_policy_feature.mojom.h" - #endif // !BUILDFLAG(IS_ANDROID) - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - #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 -@@ -635,7 +635,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" -@@ -644,7 +644,7 @@ - #endif - - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ -- BUILDFLAG(IS_CHROMEOS) -+ BUILDFLAG(IS_CHROMEOS) || 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) -@@ -653,7 +653,7 @@ - #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.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" -@@ -1537,7 +1537,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre - registry->RegisterBooleanPref(prefs::kDeviceNativeClientForceAllowedCache, - 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) -@@ -1745,7 +1745,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo - #elif BUILDFLAG(IS_CHROMEOS) - main_parts = std::make_unique<ash::ChromeBrowserMainPartsAsh>( - is_integration_test, &startup_data_); --#elif BUILDFLAG(IS_LINUX) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - main_parts = std::make_unique<ChromeBrowserMainPartsLinux>( - is_integration_test, &startup_data_); - #elif BUILDFLAG(IS_ANDROID) -@@ -1774,7 +1774,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo - // Construct additional browser parts. Stages are called in the order in - // which they are added. - #if defined(TOOLKIT_VIEWS) --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - main_parts->AddParts( - std::make_unique<ChromeBrowserMainExtraPartsViewsLinux>()); - #else -@@ -1791,7 +1791,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo - main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsAsh>()); - #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>()); -@@ -1810,7 +1810,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>()); -@@ -2692,7 +2692,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(); -@@ -2701,7 +2703,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( -@@ -3057,7 +3059,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin - } - } - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !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)) { -@@ -4902,7 +4904,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, -@@ -5421,7 +5423,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); -@@ -5438,7 +5440,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) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle:: - MaybeCreateThrottleFor(handle), - &throttles); -@@ -5477,7 +5479,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); -@@ -7388,7 +7390,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) { |
