diff options
Diffstat (limited to 'www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc')
| -rw-r--r-- | www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc b/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc index db49d7358c07..75c4ed1a175b 100644 --- a/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc +++ b/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc @@ -1,6 +1,6 @@ ---- chrome/browser/prefs/browser_prefs.cc.orig 2022-05-19 14:06:27 UTC +--- chrome/browser/prefs/browser_prefs.cc.orig 2022-06-17 14:20:10 UTC +++ chrome/browser/prefs/browser_prefs.cc -@@ -430,14 +430,14 @@ +@@ -434,14 +434,14 @@ #include "components/os_crypt/os_crypt.h" #endif @@ -17,7 +17,7 @@ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) #include "chrome/browser/browser_switcher/browser_switcher_prefs.h" #endif -@@ -1191,7 +1191,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) +@@ -1177,7 +1177,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) #endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) #endif // BUILDFLAG(IS_WIN) @@ -26,16 +26,7 @@ (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) web_app::url_handler_prefs::RegisterLocalStatePrefs(registry); #endif -@@ -1205,7 +1205,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) - registry->RegisterBooleanPref( - policy::policy_prefs::kSetTimeoutWithout1MsClampEnabled, false); - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - screen_ai::RegisterLocalStatePrefs(registry); - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) - -@@ -1504,7 +1504,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync +@@ -1492,7 +1492,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. |