Discharge7443/brave-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Conflict-resolved patches from Chromium 109.0.5410.0 to Chromium 109.0.5414.8.

Browse Source
This commit is contained in:
Claudio DeSouza
2022-12-15 14:18:50 -05:00
committed by Max Karolinskiy
parent ec549a9a4e
commit 1fb8eaf199
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
patches/chrome-VERSION.patch
+3 -3
View File
@@ -1,12 +1,12 @@
diff --git a/chrome/VERSION b/chrome/VERSION
index 482426a89a8f73935742de3e627ea03275260b57..62af27994a58830163bb823e37761dd28213ce71 100644
index 743961465d8be99f1768e30d48fe8eeae0959adf..aecc24258a9b839ce481d55f3d41f8b1c7531f80 100644
--- a/chrome/VERSION
+++ b/chrome/VERSION
@@ -1,4 +1,4 @@
MAJOR=109
-MINOR=0
-BUILD=5410
-PATCH=0
-BUILD=5414
-PATCH=8
+MINOR=1
+BUILD=48
+PATCH=59
patches/chrome-browser-prefs-browser_prefs.cc.patch
+5 -5
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index a26818d27f3c665a7a6fa367e2b99684f20b7508..b8476218f7e5f52d8b61717f091d44885717633a 100644
index b0fd561c06612be55aa5910c69311ede168230ac..b08f04aeeed7d2da4747538cef026f313c133cf3 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -1246,6 +1246,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
@@ -1269,6 +1269,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
DeviceOAuth2TokenStoreDesktop::RegisterPrefs(registry);
#endif
@@ -11,10 +11,10 @@ index a26818d27f3c665a7a6fa367e2b99684f20b7508..b8476218f7e5f52d8b61717f091d4488
#if BUILDFLAG(ENABLE_SCREEN_AI_SERVICE)
screen_ai::RegisterLocalStatePrefs(registry);
#endif // BUILDFLAG(ENABLE_SCREEN_AI_SERVICE)
@@ -1618,6 +1620,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
registry->RegisterBooleanPref(prefs::kVirtualKeyboardResizesLayoutByDefault,
false);
@@ -1645,6 +1647,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
#endif
registry->RegisterTimePref(prefs::kDIPSTimerLastUpdate, base::Time());
+ brave::RegisterProfilePrefs(registry);
}
patches/ios-chrome-browser-prefs-browser_prefs.mm.patch
+6 -6
View File
@@ -1,16 +1,16 @@
diff --git a/ios/chrome/browser/prefs/browser_prefs.mm b/ios/chrome/browser/prefs/browser_prefs.mm
index 127a063b29fe66fcb9675a5dd1e83cc3d610c739..352749ce2856cc0d6d8aa3581ec0387b689108a6 100644
index 02ea72427d002a38a4c31491330878898c46ae62..79ab97a302d02ec3aa049d0ad09633b3e68162fa 100644
--- a/ios/chrome/browser/prefs/browser_prefs.mm
+++ b/ios/chrome/browser/prefs/browser_prefs.mm
@@ -199,6 +199,7 @@ void RegisterLocalStatePrefs(PrefRegistrySimple* registry) {
// times a user should see autofill branding animation after installation.
registry->RegisterIntegerPref(
@@ -206,6 +206,7 @@ void RegisterLocalStatePrefs(PrefRegistrySimple* registry) {
prefs::kAutofillBrandingIconAnimationRemainingCountPrefName, 2);
registry->RegisterDictionaryPref(kLocalConsentsDictionary);
+ BRAVE_REGISTER_LOCAL_STATE_PREFS
}
void RegisterBrowserStatePrefs(user_prefs::PrefRegistrySyncable* registry) {
@@ -329,6 +330,7 @@ void RegisterBrowserStatePrefs(user_prefs::PrefRegistrySyncable* registry) {
@@ -336,6 +337,7 @@ void RegisterBrowserStatePrefs(user_prefs::PrefRegistrySyncable* registry) {
base::to_underlying(
prerender_prefs::NetworkPredictionSetting::kEnabledWifiOnly),
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
@@ -18,7 +18,7 @@ index 127a063b29fe66fcb9675a5dd1e83cc3d610c739..352749ce2856cc0d6d8aa3581ec0387b
}
// This method should be periodically pruned of year+ old migrations.
@@ -388,4 +390,5 @@ void MigrateObsoleteBrowserStatePrefs(PrefService* prefs) {
@@ -398,4 +400,5 @@ void MigrateObsoleteBrowserStatePrefs(PrefService* prefs) {
if (!account_id.empty())
prefs->SetString(prefs::kGoogleServicesLastGaiaId, account_id);
}