diff options
| author | Matthias Wolf <freebsd@rheinwolf.de> | 2022-02-01 18:38:49 +0100 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2022-02-01 18:45:40 +0100 |
| commit | aa70a996eae7376396a5dd8a9e5105bebb6bc72c (patch) | |
| tree | ee91e0564101803a57091d4df8e4f3892eb8d0fc /www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc | |
| parent | www/firefox-esr: update to 91.6.0 (rc1) (diff) | |
www/chromium: update to 97.0.4692.99
Note that the port is currently broken on i386 as it does not compile there.
Security: https://vuxml.freebsd.org/freebsd/51496cbc-7a0e-11ec-a323-3065ec8fd3ec.html
Security: https://vuxml.freebsd.org/freebsd/9eeccbf3-6e26-11ec-bb10-3065ec8fd3ec.html
Security: https://vuxml.freebsd.org/freebsd/fb9ba490-5cc4-11ec-aac7-3065ec8fd3ec.html
Security: https://vuxml.freebsd.org/freebsd/18ac074c-579f-11ec-aac7-3065ec8fd3ec.html
Security: https://vuxml.freebsd.org/freebsd/b8c0cbca-472d-11ec-83dc-3065ec8fd3ec.html
Security: https://vuxml.freebsd.org/freebsd/976d7bf9-38ea-11ec-b3b0-3065ec8fd3ec.html
Security: https://vuxml.freebsd.org/freebsd/bdaecfad-3117-11ec-b3b0-3065ec8fd3ec.html
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 | 39 |
1 files changed, 33 insertions, 6 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 93f24890d4a0..957158812095 100644 --- a/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc +++ b/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc @@ -1,12 +1,12 @@ ---- chrome/browser/prefs/browser_prefs.cc.orig 2021-09-24 04:25:59 UTC +--- chrome/browser/prefs/browser_prefs.cc.orig 2021-12-31 00:57:23 UTC +++ chrome/browser/prefs/browser_prefs.cc -@@ -405,14 +405,14 @@ +@@ -412,14 +412,14 @@ #endif #if defined(OS_WIN) || defined(OS_MAC) || \ - (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) + (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) - #include "chrome/browser/web_applications/components/url_handler_prefs.h" + #include "chrome/browser/web_applications/url_handler_prefs.h" #endif // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch @@ -17,7 +17,25 @@ #include "chrome/browser/browser_switcher/browser_switcher_prefs.h" #endif -@@ -1012,10 +1012,10 @@ void RegisterLocalState(PrefRegistrySimple* registry) +@@ -493,7 +493,7 @@ const char kLocalDiscoveryNotificationsEnabled[] = + #endif + + // Deprecated 11/2020 +-#if defined(OS_LINUX) && !BUILDFLAG(IS_CHROMECAST) ++#if (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMECAST)) || defined(OS_BSD) + const char kMigrationToLoginDBStep[] = "profile.migration_to_logindb_step"; + #endif + +@@ -755,7 +755,7 @@ void RegisterProfilePrefsForMigration( + + registry->RegisterBooleanPref(prefs::kWebAppsUserDisplayModeCleanedUp, false); + +-#if defined(OS_LINUX) && !BUILDFLAG(IS_CHROMECAST) ++#if (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMECAST)) || defined(OS_BSD) + registry->RegisterIntegerPref(kMigrationToLoginDBStep, 0); + #endif + +@@ -1079,10 +1079,10 @@ void RegisterLocalState(PrefRegistrySimple* registry) // TODO(crbug/1169547) Remove `BUILDFLAG(IS_CHROMEOS_LACROS)` once the // migration is complete. @@ -30,7 +48,7 @@ #if defined(OS_MAC) confirm_quit::RegisterLocalState(registry); -@@ -1043,7 +1043,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) +@@ -1112,7 +1112,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) #endif // defined(OS_WIN) #if defined(OS_WIN) || defined(OS_MAC) || \ @@ -39,7 +57,7 @@ web_app::url_handler_prefs::RegisterLocalStatePrefs(registry); #endif -@@ -1335,7 +1335,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync +@@ -1405,7 +1405,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if defined(OS_WIN) || defined(OS_MAC) || \ @@ -48,3 +66,12 @@ browser_switcher::BrowserSwitcherPrefs::RegisterProfilePrefs(registry); #endif +@@ -1554,7 +1554,7 @@ void MigrateObsoleteProfilePrefs(Profile* profile) { + profile_prefs); + + // Added 11/2020 +-#if defined(OS_LINUX) && !BUILDFLAG(IS_CHROMECAST) ++#if (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMECAST)) || defined(OS_BSD) + profile_prefs->ClearPref(kMigrationToLoginDBStep); + #endif + |