diff options
| author | Matthias Wolf <freebsd@rheinwolf.de> | 2021-10-19 21:33:45 +0200 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2021-10-19 21:39:45 +0200 |
| commit | 336f302a55ad11465a4255ae250715b962639010 (patch) | |
| tree | c3e9a3cf7406fdf5fdb0ab3c60d132043615c2d7 /www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc | |
| parent | security/vaultwarden: Update web-vault to 2.23.0c (diff) | |
www/chromium: update to 94.0.4606.81
MFH: 2021Q4
Security: https://vuxml.freebsd.org/freebsd/a7732806-0b2a-11ec-836b-3065ec8fd3ec.html
Security: https://vuxml.freebsd.org/freebsd/47b571f2-157b-11ec-ae98-704d7b472482.html
Security: https://vuxml.freebsd.org/freebsd/3551e106-1b17-11ec-a8a7-704d7b472482.html
Security: https://vuxml.freebsd.org/freebsd/b6c875f1-1d76-11ec-ae80-704d7b472482.html
Security: https://vuxml.freebsd.org/freebsd/777edbbe-2230-11ec-8869-704d7b472482.html
Security: https://vuxml.freebsd.org/freebsd/7d3d94d3-2810-11ec-9c51-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 | 10 |
1 files changed, 5 insertions, 5 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 b26510726f6b..93f24890d4a0 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 2021-07-19 18:45:09 UTC +--- chrome/browser/prefs/browser_prefs.cc.orig 2021-09-24 04:25:59 UTC +++ chrome/browser/prefs/browser_prefs.cc -@@ -395,14 +395,14 @@ +@@ -405,14 +405,14 @@ #endif #if defined(OS_WIN) || defined(OS_MAC) || \ @@ -17,7 +17,7 @@ #include "chrome/browser/browser_switcher/browser_switcher_prefs.h" #endif -@@ -883,10 +883,10 @@ void RegisterLocalState(PrefRegistrySimple* registry) +@@ -1012,10 +1012,10 @@ void RegisterLocalState(PrefRegistrySimple* registry) // TODO(crbug/1169547) Remove `BUILDFLAG(IS_CHROMEOS_LACROS)` once the // migration is complete. @@ -30,7 +30,7 @@ #if defined(OS_MAC) confirm_quit::RegisterLocalState(registry); -@@ -914,7 +914,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) +@@ -1043,7 +1043,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) #endif // defined(OS_WIN) #if defined(OS_WIN) || defined(OS_MAC) || \ @@ -39,7 +39,7 @@ web_app::url_handler_prefs::RegisterLocalStatePrefs(registry); #endif -@@ -1205,7 +1205,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync +@@ -1335,7 +1335,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) || \ |