diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch index a3f3f8f9dbb..f8a76ceb9ab 100644 --- a/patches/chrome-VERSION.patch +++ b/patches/chrome-VERSION.patch @@ -1,12 +1,12 @@ diff --git a/chrome/VERSION b/chrome/VERSION -index aa85440488da12b166079adfa0521dee3d383366..c62b21ae037c34e38139df87a89ded60be9980a3 100644 +index 8dfb9a20a24ad44a9997887303c45336ad505e09..08432ab8281f9ab2e50fa7ee7e01e0520f33a5f6 100644 --- a/chrome/VERSION +++ b/chrome/VERSION @@ -1,4 +1,4 @@ MAJOR=114 -MINOR=0 -BUILD=5735 --PATCH=9 +-PATCH=16 +MINOR=1 +BUILD=53 +PATCH=41 diff --git a/patches/chrome-android-java-AndroidManifest.xml.patch b/patches/chrome-android-java-AndroidManifest.xml.patch index b6fc92a7410..fbbb81422c1 100644 --- a/patches/chrome-android-java-AndroidManifest.xml.patch +++ b/patches/chrome-android-java-AndroidManifest.xml.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml -index 34578efef4913e5040ba1bf6c13c206360eb89db..05cab8dda6c50d4e9121a8bfe3b9a8d5171e99d3 100644 +index db72fb7356e29c1aa400bfaa6a5577e3a64b361f..c453574c6cdae8cffae28aa8a9d19e4599e3a6ad 100644 --- a/chrome/android/java/AndroidManifest.xml +++ b/chrome/android/java/AndroidManifest.xml @@ -28,6 +28,7 @@ by a child template that "extends" this file. @@ -14,9 +14,8 @@ index 34578efef4913e5040ba1bf6c13c206360eb89db..05cab8dda6c50d4e9121a8bfe3b9a8d5 -- + @@ -29,14 +28,12 @@ index 34578efef4913e5040ba1bf6c13c206360eb89db..05cab8dda6c50d4e9121a8bfe3b9a8d5 +--> -- + -- + @@ -45,9 +42,8 @@ index 34578efef4913e5040ba1bf6c13c206360eb89db..05cab8dda6c50d4e9121a8bfe3b9a8d5 -- + @@ -56,9 +52,8 @@ index 34578efef4913e5040ba1bf6c13c206360eb89db..05cab8dda6c50d4e9121a8bfe3b9a8d5 -- + {% block extra_uses_permissions %} @@ -79,9 +74,9 @@ index 34578efef4913e5040ba1bf6c13c206360eb89db..05cab8dda6c50d4e9121a8bfe3b9a8d5 -@@ -1202,6 +1217,7 @@ by a child template that "extends" this file. - android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize" > - +@@ -1213,6 +1228,7 @@ by a child template that "extends" this file. + + {% include "//brave/android/java/AndroidManifest.xml" %} {% block extra_application_definitions %} diff --git a/patches/components-content_settings-core-common-content_settings.cc.patch b/patches/components-content_settings-core-common-content_settings.cc.patch index 7677d65f761..8308c40bbd9 100644 --- a/patches/components-content_settings-core-common-content_settings.cc.patch +++ b/patches/components-content_settings-core-common-content_settings.cc.patch @@ -1,12 +1,12 @@ diff --git a/components/content_settings/core/common/content_settings.cc b/components/content_settings/core/common/content_settings.cc -index 592bccb7e10c3f6f4b44eaf3eb43dd591f305b51..0f36305fbdcb47f2684c818ebc6770724da75ed2 100644 +index fcd6d94a41f75c0b7fbc6578d50bda340381b3dd..6d0f2a90388a35d38ba3a5b03988c448bae80872 100644 --- a/components/content_settings/core/common/content_settings.cc +++ b/components/content_settings/core/common/content_settings.cc -@@ -118,6 +118,7 @@ constexpr HistogramValue kHistogramValue[] = { - 95}, +@@ -119,6 +119,7 @@ constexpr HistogramValue kHistogramValue[] = { {ContentSettingsType::ANTI_ABUSE, 96}, {ContentSettingsType::THIRD_PARTY_STORAGE_PARTITIONING, 97}, -+ BRAVE_HISTOGRAM_VALUE_LIST + {ContentSettingsType::HTTPS_ENFORCED, 98}, ++ BRAVE_HISTOGRAM_VALUE_LIST }; void FilterRulesForType(ContentSettingsForOneType& settings, diff --git a/patches/components-content_settings-core-common-content_settings_types.h.patch b/patches/components-content_settings-core-common-content_settings_types.h.patch index 3f0842e874c..7f684e5d8b8 100644 --- a/patches/components-content_settings-core-common-content_settings_types.h.patch +++ b/patches/components-content_settings-core-common-content_settings_types.h.patch @@ -1,10 +1,10 @@ diff --git a/components/content_settings/core/common/content_settings_types.h b/components/content_settings/core/common/content_settings_types.h -index 4eb53ed3da74c4798815bf592f01cc6fc086bd9d..24d0e534ce035968ee5fcfc8e3c71618a80f5fd5 100644 +index 60afa8e0c3bb97fe2866eb6a8c81723d06c03a1f..04dd187409188fd79e74c1f465dff3eb7342f640 100644 --- a/components/content_settings/core/common/content_settings_types.h +++ b/components/content_settings/core/common/content_settings_types.h -@@ -327,6 +327,22 @@ enum class ContentSettingsType : int32_t { - // should be enabled. - THIRD_PARTY_STORAGE_PARTITIONING, +@@ -330,6 +330,22 @@ enum class ContentSettingsType : int32_t { + // Used to indicate whether HTTPS-First Mode is enabled on the hostname. + HTTPS_ENFORCED, + BRAVE_START, + BRAVE_ADS = BRAVE_START, diff --git a/patches/ios-chrome-browser-prefs-browser_prefs.mm.patch b/patches/ios-chrome-browser-prefs-browser_prefs.mm.patch index 32d9692d24e..8ed58793440 100644 --- a/patches/ios-chrome-browser-prefs-browser_prefs.mm.patch +++ b/patches/ios-chrome-browser-prefs-browser_prefs.mm.patch @@ -1,16 +1,16 @@ diff --git a/ios/chrome/browser/prefs/browser_prefs.mm b/ios/chrome/browser/prefs/browser_prefs.mm -index aa7a28e5105ea7245eae3f56080c84a8d610a894..a6689750f6917261dd4b52704d238bf1f2e3c698 100644 +index dec58a72bdbed2a725c3ffa1465f34f146d06863..b7742f259cbad920734690caeae49ee620aa7729 100644 --- a/ios/chrome/browser/prefs/browser_prefs.mm +++ b/ios/chrome/browser/prefs/browser_prefs.mm -@@ -236,6 +236,7 @@ void RegisterLocalStatePrefs(PrefRegistrySimple* registry) { - // Preferences related to tab grid. - // Default to 0 which is the unassigned value. - registry->RegisterIntegerPref(prefs::kInactiveTabsTimeThreshold, 0); +@@ -239,6 +239,7 @@ void RegisterLocalStatePrefs(PrefRegistrySimple* registry) { + + registry->RegisterIntegerPref(prefs::kIosSyncSegmentsNewTabPageDisplayCount, + 0); + BRAVE_REGISTER_LOCAL_STATE_PREFS } void RegisterBrowserStatePrefs(user_prefs::PrefRegistrySyncable* registry) { -@@ -389,6 +390,7 @@ void RegisterBrowserStatePrefs(user_prefs::PrefRegistrySyncable* registry) { +@@ -392,6 +393,7 @@ void RegisterBrowserStatePrefs(user_prefs::PrefRegistrySyncable* registry) { ntp_snippets::prefs::RegisterProfilePrefsForMigrationApril2023(registry); registry->RegisterBooleanPref(kDeprecatedReadingListHasUnseenEntries, false); @@ -18,9 +18,11 @@ index aa7a28e5105ea7245eae3f56080c84a8d610a894..a6689750f6917261dd4b52704d238bf1 } // This method should be periodically pruned of year+ old migrations. -@@ -465,4 +467,5 @@ void MigrateObsoleteBrowserStatePrefs(PrefService* prefs) { - - // Added 04/2023. - ntp_snippets::prefs::MigrateObsoleteProfilePrefsApril2023(prefs); +@@ -421,6 +423,7 @@ void MigrateObsoleteLocalStatePrefs(PrefService* prefs) { + if (prefs->FindPreference(kTrialPrefName)) { + prefs->ClearPref(kTrialPrefName); + } + BRAVE_MIGRATE_OBSOLETE_BROWSER_STATE_PREFS } + + // This method should be periodically pruned of year+ old migrations.