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

Conflict-resolved patches from Chromium 112.0.5610.0 to Chromium 112.0.5615.12.

Browse Source
This commit is contained in:
Claudio DeSouza
2023-03-17 18:51:25 -04:00
committed by mkarolin
parent e99d087519
commit c4afcc043c
6 changed files with 20 additions and 21 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 135f39a09f9e21543b1bdd6b3ed9480ae8ef6760..ee623142fd10797ead0435ac07a136f562b35e0b 100644
index 2497593454b4d3580f4137dd91b21732cba101e9..03ff2f35e3d4d5d545236f158aa3be47fd40b96a 100644
--- a/chrome/VERSION
+++ b/chrome/VERSION
@@ -1,4 +1,4 @@
MAJOR=112
-MINOR=0
-BUILD=5610
-PATCH=0
-BUILD=5615
-PATCH=12
+MINOR=1
+BUILD=51
+PATCH=43
patches/components-browser_ui-site_settings-android-java-src-org-chromium-components-browser_ui-site_settings-SiteSettingsCategory.java.patch
+2 -3
View File
@@ -5,14 +5,13 @@ index ac5c71ffb62eec1988e820b500cbb78ce6702bc9..d42ed242a6e69a325d906ef943411420
@@ -47,7 +47,7 @@ public class SiteSettingsCategory {
Type.PROTECTED_MEDIA, Type.SENSORS, Type.SOUND, Type.USB, Type.VIRTUAL_REALITY,
Type.USE_STORAGE, Type.AUTO_DARK_WEB_CONTENT, Type.REQUEST_DESKTOP_SITE,
Type.FEDERATED_IDENTITY_API, Type.THIRD_PARTY_COOKIES, Type.SITE_DATA,
Type.FEDERATED_IDENTITY_API, Type.THIRD_PARTY_COOKIES, Type.SITE_DATA, Type.ANTI_ABUSE,
- Type.NUM_ENTRIES})
+ Type.NUM_ENTRIES, Type.AUTOPLAY, Type.BRAVE_GOOGLE_SIGN_IN})
@Retention(RetentionPolicy.SOURCE)
public @interface Type {
// All updates here must also be reflected in {@link #preferenceKey(int)
@@ -80,10 +80,11 @@ public class SiteSettingsCategory {
int FEDERATED_IDENTITY_API = 25;
@@ -81,10 +81,11 @@ public class SiteSettingsCategory {
int THIRD_PARTY_COOKIES = 26;
int SITE_DATA = 27;
+ int AUTOPLAY = 28; int BRAVE_GOOGLE_SIGN_IN = 29;
patches/components-content_settings-core-browser-content_settings_registry.cc.patch
+3 -3
View File
@@ -1,9 +1,9 @@
diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc
index 7d82a65b35ef46e3f64c3a738d0d14158ed15c35..428cbcccfe512b2451ddb5335007d5009943e216 100644
index 6a94580fd6a9269c2b52e9285e31f965e2b1a56c..0e451646b15e4385caa3878eda5589b47d3614ae 100644
--- a/components/content_settings/core/browser/content_settings_registry.cc
+++ b/components/content_settings/core/browser/content_settings_registry.cc
@@ -573,6 +573,7 @@ void ContentSettingsRegistry::Init() {
WebsiteSettingsRegistry::ALL_PLATFORMS,
@@ -583,6 +583,7 @@ void ContentSettingsRegistry::Init() {
WebsiteSettingsRegistry::PLATFORM_ANDROID,
ContentSettingsInfo::INHERIT_IN_INCOGNITO,
ContentSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY);
+ BRAVE_INIT
patches/components-content_settings-core-common-content_settings.cc.patch
+3 -3
View File
@@ -1,11 +1,11 @@
diff --git a/components/content_settings/core/common/content_settings.cc b/components/content_settings/core/common/content_settings.cc
index a1a7aefed4bcb78eec3ed843ab7ea46db39d03b9..575e35c4d0c0b10491060f04475031d0b524ca01 100644
index 77734c8f9d6e30796a6c49f19a3371aad01897e4..8f65324dc61c2c33800722277d0bda698d5dc0d7 100644
--- a/components/content_settings/core/common/content_settings.cc
+++ b/components/content_settings/core/common/content_settings.cc
@@ -116,6 +116,7 @@ constexpr HistogramValue kHistogramValue[] = {
{ContentSettingsType::FEDERATED_IDENTITY_AUTO_REAUTHN_PERMISSION, 94},
@@ -117,6 +117,7 @@ constexpr HistogramValue kHistogramValue[] = {
{ContentSettingsType::FEDERATED_IDENTITY_IDENTITY_PROVIDER_REGISTRATION,
95},
{ContentSettingsType::ANTI_ABUSE, 96},
+ BRAVE_HISTOGRAM_VALUE_LIST
};
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 8e99f7b942c692d956cab8dd6e560fda6fd66236..46f56cac5eb00d4e69d3c365d6dddb30b0eb555f 100644
index 06aae1b9288ca07cad39f32c17865e38c3a98756..79e6b7262aebad2990bf58b5e415a06a57a0fdbd 100644
--- a/ios/chrome/browser/prefs/browser_prefs.mm
+++ b/ios/chrome/browser/prefs/browser_prefs.mm
@@ -267,6 +267,7 @@ void RegisterLocalStatePrefs(PrefRegistrySimple* registry) {
@@ -272,6 +272,7 @@ void RegisterLocalStatePrefs(PrefRegistrySimple* registry) {
registry->RegisterBooleanPref(prefs::kIosCredentialProviderPromoStopPromo,
false);
registry->RegisterBooleanPref(
prefs::kIosCredentialProviderPromoHasRegisteredWithPromoManager, false);
+ BRAVE_REGISTER_LOCAL_STATE_PREFS
}
void RegisterBrowserStatePrefs(user_prefs::PrefRegistrySyncable* registry) {
@@ -404,6 +405,7 @@ void RegisterBrowserStatePrefs(user_prefs::PrefRegistrySyncable* registry) {
@@ -409,6 +410,7 @@ void RegisterBrowserStatePrefs(user_prefs::PrefRegistrySyncable* registry) {
base::to_underlying(
prerender_prefs::NetworkPredictionSetting::kEnabledWifiOnly),
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
@@ -18,7 +18,7 @@ index 8e99f7b942c692d956cab8dd6e560fda6fd66236..46f56cac5eb00d4e69d3c365d6dddb30
}
// This method should be periodically pruned of year+ old migrations.
@@ -549,4 +551,5 @@ void MigrateObsoleteBrowserStatePrefs(PrefService* prefs) {
@@ -554,4 +556,5 @@ void MigrateObsoleteBrowserStatePrefs(PrefService* prefs) {
if (prefs->FindPreference(kUserClassifierLastTimeToUseSuggestions)) {
prefs->ClearPref(kUserClassifierLastTimeToUseSuggestions);
}
patches/ui-webui-resources-BUILD.gn.patch
+3 -3
View File
@@ -1,9 +1,9 @@
diff --git a/ui/webui/resources/BUILD.gn b/ui/webui/resources/BUILD.gn
index 522e3c252dac3890a80eb335db62a2c38097d5bc..01dfa8141d99539fedd76adacd540f7fc848e064 100644
index b9bac52390e72642c485fc9e82d82a02b5b97894..4596f1687e2d005b0ab49a3a27f3b9da4f0a5d03 100644
--- a/ui/webui/resources/BUILD.gn
+++ b/ui/webui/resources/BUILD.gn
@@ -115,6 +115,7 @@ generate_grd("build_grd") {
"$root_gen_dir/ui/webui/resources/cr_components/color_change_listener/resources.grdp",
@@ -121,6 +121,7 @@ generate_grd("build_grd") {
"$root_gen_dir/ui/webui/resources/cr_components/image_service/resources.grdp",
]
}
+ import("//brave/ui/webui/resources/sources.gni") grdp_files += brave_resources_extra_grdps public_deps += brave_resources_extra_grdps_deps