diff options
Diffstat (limited to 'www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc')
| -rw-r--r-- | www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc | 99 |
1 files changed, 20 insertions, 79 deletions
diff --git a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc index 8d522995cced..f75ed139169f 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc +++ b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_content_browser_client.cc.orig 2025-05-28 14:55:43 UTC +--- chrome/browser/chrome_content_browser_client.cc.orig 2025-07-02 06:08:04 UTC +++ chrome/browser/chrome_content_browser_client.cc -@@ -506,7 +506,7 @@ +@@ -468,7 +468,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" @@ -9,39 +9,25 @@ #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) -@@ -621,11 +621,11 @@ +@@ -563,7 +563,7 @@ #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 -@@ -636,7 +636,7 @@ - #include "chrome/browser/apps/link_capturing/web_app_link_capturing_delegate.h" +@@ -572,7 +572,7 @@ + #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/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" -@@ -647,7 +647,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" - #include "chrome/browser/enterprise/incognito/incognito_navigation_throttle.h" - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || -@@ -657,7 +657,7 @@ +@@ -580,7 +580,7 @@ #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h" #endif @@ -50,7 +36,7 @@ #include "chrome/browser/chrome_browser_main_extra_parts_linux.h" #elif BUILDFLAG(IS_OZONE) #include "chrome/browser/chrome_browser_main_extra_parts_ozone.h" -@@ -1558,7 +1558,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre +@@ -1398,7 +1398,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre registry->RegisterBooleanPref(prefs::kDeviceNativeClientForceAllowedCache, false); #endif // BUILDFLAG(IS_CHROMEOS) @@ -59,16 +45,7 @@ registry->RegisterBooleanPref(prefs::kOutOfProcessSystemDnsResolutionEnabled, true); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) -@@ -1651,7 +1651,7 @@ void ChromeContentBrowserClient::RegisterProfilePrefs( - policy::policy_prefs::kForcePermissionPolicyUnloadDefaultEnabled, false); - - #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ -- BUILDFLAG(IS_LINUX) -+ BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - registry->RegisterListPref(prefs::kMandatoryExtensionsForIncognitoNavigation); - #endif - -@@ -1775,7 +1775,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1617,7 +1617,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo #elif BUILDFLAG(IS_CHROMEOS) main_parts = std::make_unique<ash::ChromeBrowserMainPartsAsh>( is_integration_test, &startup_data_); @@ -77,16 +54,16 @@ main_parts = std::make_unique<ChromeBrowserMainPartsLinux>( is_integration_test, &startup_data_); #elif BUILDFLAG(IS_ANDROID) -@@ -1804,7 +1804,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo - // Construct additional browser parts. Stages are called in the order in - // which they are added. +@@ -1648,7 +1648,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 -@@ -1821,7 +1821,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1665,7 +1665,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsAsh>()); #endif @@ -95,7 +72,7 @@ main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLinux>()); #elif BUILDFLAG(IS_OZONE) main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsOzone>()); -@@ -1840,7 +1840,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1684,7 +1684,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo chrome::AddMetricsExtraParts(main_parts.get()); @@ -104,7 +81,7 @@ main_parts->AddParts( std::make_unique< enterprise_util::ChromeBrowserMainExtraPartsEnterprise>()); -@@ -2744,7 +2744,9 @@ void MaybeAppendBlinkSettingsSwitchForFieldTrial( +@@ -2628,7 +2628,9 @@ void MaybeAppendBlinkSettingsSwitchForFieldTrial( void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( base::CommandLine* command_line, int child_process_id) { @@ -114,7 +91,7 @@ #if BUILDFLAG(IS_MAC) std::unique_ptr<metrics::ClientInfo> client_info = GoogleUpdateSettings::LoadMetricsClientInfo(); -@@ -2753,7 +2755,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -2637,7 +2639,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin client_info->client_id); } #elif BUILDFLAG(IS_POSIX) @@ -123,7 +100,7 @@ pid_t pid; if (crash_reporter::GetHandlerSocket(nullptr, &pid)) { command_line->AppendSwitchASCII( -@@ -3117,7 +3119,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -3005,7 +3007,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin } } @@ -132,7 +109,7 @@ // Opt into a hardened stack canary mitigation if it hasn't already been // force-disabled. if (!browser_command_line.HasSwitch(switches::kChangeStackGuardOnFork)) { -@@ -4067,7 +4069,7 @@ bool UpdatePreferredColorScheme(WebPreferences* web_pr +@@ -3994,7 +3996,7 @@ bool UpdatePreferredColorScheme(WebPreferences* web_pr return old_preferred_color_scheme != web_prefs->preferred_color_scheme; } @@ -141,7 +118,7 @@ // Sets the `root_scrollbar_theme_color` web pref if the user has enabled a // custom colored frame for the UI. void UpdateRootScrollbarThemeColor(Profile* profile, -@@ -4697,7 +4699,7 @@ void ChromeContentBrowserClient::OverrideWebPreference +@@ -4631,7 +4633,7 @@ void ChromeContentBrowserClient::OverrideWebPreference UpdatePreferredColorScheme(web_prefs, main_frame_site.GetSiteURL(), web_contents, GetWebTheme()); @@ -150,7 +127,7 @@ UpdateRootScrollbarThemeColor(profile, web_contents, web_prefs); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -@@ -5017,7 +5019,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst +@@ -4956,7 +4958,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst } } @@ -159,43 +136,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -5529,7 +5531,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); -@@ -5553,7 +5555,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); -@@ -5594,7 +5596,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati - } - #endif - --#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); -@@ -5716,7 +5718,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati - &throttles); - #endif // BUILDFLAG(IS_CHROMEOS) - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - if (profile && profile->IsIncognitoProfile() && profile->IsOffTheRecord()) { - MaybeAddThrottle(enterprise_incognito::IncognitoNavigationThrottle:: - MaybeCreateThrottleFor(handle), -@@ -7544,7 +7546,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS +@@ -7120,7 +7122,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS bool ChromeContentBrowserClient::ShouldRunOutOfProcessSystemDnsResolution() { // This enterprise policy is supported on Android, but the feature will not be // launched there. |