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

Conflict-resolved patches from Chromium 103.0.5028.0 to Chromium 103.0.5042.0.

Browse Source
This commit is contained in:
Claudio DeSouza
2022-06-10 05:58:19 -04:00
committed by Emerick Rogul
parent 9e02fd316c
commit 1b50dde3d7
8 changed files with 28 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
patches/chrome-VERSION.patch
+2 -2
View File
@@ -1,11 +1,11 @@
diff --git a/chrome/VERSION b/chrome/VERSION
index 9d72f053f13cfb11de6da0a19ee445c4aa4669a8..ac3cb4c3626e1db53170190598b39bcfc6d589fc 100644
index 8ae10f7a4d984d0241010121143e286595a9c9ed..ac3cb4c3626e1db53170190598b39bcfc6d589fc 100644
--- a/chrome/VERSION
+++ b/chrome/VERSION
@@ -1,4 +1,4 @@
MAJOR=103
-MINOR=0
-BUILD=5028
-BUILD=5042
-PATCH=0
+MINOR=1
+BUILD=41
patches/chrome-android-java-src-org-chromium-chrome-browser-app-ChromeActivity.java.patch
+3 -3
View File
@@ -1,9 +1,9 @@
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
index 361157dee0ff3e88f671d525bd130fa889395dfc..0456f31dac9d4c7cff7a3a2b4734e73028fe6ddb 100644
index a7f5f2b1bbc02d70113857fb2069b43f5b493a3d..9717499bd68b5accb98a4de5c04c20ddccd9bc12 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
@@ -398,7 +398,7 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
private SubscriptionsManager mSubscriptionsManager;
@@ -400,7 +400,7 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
private TextBubbleBackPressHandler mTextBubbleBackPressHandler;
protected ChromeActivity() {
- mIntentHandler = new IntentHandler(this, createIntentHandlerDelegate());
patches/chrome-android-java-src-org-chromium-chrome-browser-ntp-NewTabPageLayout.java.patch
+3 -3
View File
@@ -1,9 +1,9 @@
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java
index 46bf21fa4d05c453d7bfd66905e42252f45a9622..632bdd0491252fdf44b74dae1e5ed2501a37fb3c 100644
index 9d55ddbd49ec7efc8c1a2fcf5101d60863cf2d52..5533ee366ea47f0fea359401285de0c6f1435e99 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java
@@ -375,6 +375,7 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer
/* observer = */ this, offlinePageBridge);
@@ -338,6 +338,7 @@ public class NewTabPageLayout extends LinearLayout implements VrModeObserver {
assert mMvTilesContainerLayout != null;
int maxRows = 2;
+ maxRows = QueryTileSection.getMaxRowsForMostVisitedTiles(getContext());
patches/chrome-browser-notifications-android-java-src-org-chromium-chrome-browser-notifications-channels-ChromeChannelDefinitions.java.patch
+5 -5
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/notifications/android/java/src/org/chromium/chrome/browser/notifications/channels/ChromeChannelDefinitions.java b/chrome/browser/notifications/android/java/src/org/chromium/chrome/browser/notifications/channels/ChromeChannelDefinitions.java
index 81c39210ba410b8261047cee432615b268226999..daa2d5eee812440af49b78e282310ebe6a45d7bb 100644
index 1f23fd163661ca2f9169498f482642022ba53ee1..f2dc25d5b7f66fefeefd22e0aa0075e9a1f3bd9d 100644
--- a/chrome/browser/notifications/android/java/src/org/chromium/chrome/browser/notifications/channels/ChromeChannelDefinitions.java
+++ b/chrome/browser/notifications/android/java/src/org/chromium/chrome/browser/notifications/channels/ChromeChannelDefinitions.java
@@ -36,6 +36,7 @@ import java.util.Set;
@@ -18,8 +18,8 @@ index 81c39210ba410b8261047cee432615b268226999..daa2d5eee812440af49b78e282310ebe
ChannelId.MEDIA_PLAYBACK, ChannelId.SCREEN_CAPTURE, ChannelId.CONTENT_SUGGESTIONS,
ChannelId.WEBAPP_ACTIONS, ChannelId.SITES, ChannelId.SHARING, ChannelId.UPDATES,
ChannelId.COMPLETED_DOWNLOADS, ChannelId.PERMISSION_REQUESTS,
@@ -101,7 +103,7 @@ public class ChromeChannelDefinitions extends ChannelDefinitions {
String CHROME_TIPS = "chrome_tips";
@@ -102,7 +104,7 @@ public class ChromeChannelDefinitions extends ChannelDefinitions {
String BLUETOOTH = "bluetooth";
}
- @StringDef({ChannelGroupId.GENERAL, ChannelGroupId.SITES})
@@ -27,7 +27,7 @@ index 81c39210ba410b8261047cee432615b268226999..daa2d5eee812440af49b78e282310ebe
@Retention(RetentionPolicy.SOURCE)
public @interface ChannelGroupId {
String SITES = "sites";
@@ -130,6 +132,7 @@ public class ChromeChannelDefinitions extends ChannelDefinitions {
@@ -131,6 +133,7 @@ public class ChromeChannelDefinitions extends ChannelDefinitions {
Map<String, PredefinedChannel> map = new HashMap<>();
Set<String> startup = new HashSet<>();
@@ -35,7 +35,7 @@ index 81c39210ba410b8261047cee432615b268226999..daa2d5eee812440af49b78e282310ebe
map.put(ChannelId.BROWSER,
PredefinedChannel.create(ChannelId.BROWSER,
R.string.notification_category_browser,
@@ -266,6 +269,7 @@ public class ChromeChannelDefinitions extends ChannelDefinitions {
@@ -274,6 +277,7 @@ public class ChromeChannelDefinitions extends ChannelDefinitions {
static final Map<String, PredefinedChannelGroup> MAP;
static {
Map<String, PredefinedChannelGroup> map = new HashMap<>();
patches/chrome-browser-prefs-browser_prefs.cc.patch
+5 -5
View File
@@ -1,17 +1,17 @@
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index f2c15ca7c894dfa443684620c74d36e8f764bed6..62ca9134f83cb24dc79ffbaa5cbd0f4a4713bf56 100644
index dfff2d4b80809d554ba8eeec0e44d98350f17c30..8c1c7d55cd79f81879b9806736fcba5e5b216fb8 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -1228,6 +1228,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
@@ -1246,6 +1246,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
registry->RegisterBooleanPref(
policy::policy_prefs::kSetTimeoutWithout1MsClampEnabled, false);
+ brave::RegisterLocalStatePrefs(registry);
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
#if BUILDFLAG(ENABLE_SCREEN_AI_SERVICE)
screen_ai::RegisterLocalStatePrefs(registry);
@@ -1562,6 +1563,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
true);
@@ -1585,6 +1586,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
#endif
RegisterProfilePrefsForMigration(registry);
+ brave::RegisterProfilePrefs(registry);
patches/chrome-browser-resources-settings-site_settings-category_default_setting.ts.patch
+3 -3
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/resources/settings/site_settings/category_default_setting.ts b/chrome/browser/resources/settings/site_settings/category_default_setting.ts
index b09a0b36761817607989fe63588550eb548027a4..2c66270f5b06432c2d29111ef07f4dd5a217b5af 100644
index 3d6137647ab6f4584c29f81e7609505086b36297..9b8ed65a65fe3e47f0456c254454bf5345c537bd 100644
--- a/chrome/browser/resources/settings/site_settings/category_default_setting.ts
+++ b/chrome/browser/resources/settings/site_settings/category_default_setting.ts
@@ -184,6 +184,7 @@ export class CategoryDefaultSettingElement extends
@@ -8,9 +8,9 @@ index b09a0b36761817607989fe63588550eb548027a4..2c66270f5b06432c2d29111ef07f4dd5
case ContentSettingsTypes.ADS:
+ case ContentSettingsTypes.AUTOPLAY:
case ContentSettingsTypes.BACKGROUND_SYNC:
case ContentSettingsTypes.FEDERATED_IDENTITY_API:
case ContentSettingsTypes.IMAGES:
case ContentSettingsTypes.JAVASCRIPT:
@@ -217,6 +218,7 @@ export class CategoryDefaultSettingElement extends
@@ -218,6 +219,7 @@ export class CategoryDefaultSettingElement extends
case ContentSettingsTypes.USB_DEVICES:
case ContentSettingsTypes.VR:
case ContentSettingsTypes.WINDOW_PLACEMENT:
patches/components-content_settings-core-browser-content_settings_default_provider.cc.patch
+2 -2
View File
@@ -1,11 +1,11 @@
diff --git a/components/content_settings/core/browser/content_settings_default_provider.cc b/components/content_settings/core/browser/content_settings_default_provider.cc
index 1f6642baaf50f5cf1d3bd1f84a1fa9ce925599c1..9611f0899649ae2e3c7dc447b02c9a4e2b87cbec 100644
index 3a0c37be57739955356c351265f9ec6f70b5b031..785b07dce63ac61e080a8e799b1295479db45eed 100644
--- a/components/content_settings/core/browser/content_settings_default_provider.cc
+++ b/components/content_settings/core/browser/content_settings_default_provider.cc
@@ -438,6 +438,7 @@ void DefaultProvider::DiscardOrMigrateObsoletePreferences() {
}
prefs_->ClearPref(kDeprecatedEnableDRM);
#endif // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_WIN)
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN)
+BRAVE_DISCARD_OR_MIGRATE_OBSOLETE_PREFERENCES
}
patches/ios-chrome-browser-prefs-browser_prefs.mm.patch
+5 -6
View File
@@ -1,8 +1,8 @@
diff --git a/ios/chrome/browser/prefs/browser_prefs.mm b/ios/chrome/browser/prefs/browser_prefs.mm
index 47b7a1fbeaada1e44c2c63f8c7d20186d9d2a851..75f306f0e6e54668a794a39a4fae7bdce9274443 100644
index e2faaff9f797587d47350adf11743a6b4fec576d..f064774285cdd848ab5ded146ee1b521fee75ef5 100644
--- a/ios/chrome/browser/prefs/browser_prefs.mm
+++ b/ios/chrome/browser/prefs/browser_prefs.mm
@@ -212,6 +212,7 @@ void RegisterLocalStatePrefs(PrefRegistrySimple* registry) {
@@ -214,6 +214,7 @@ void RegisterLocalStatePrefs(PrefRegistrySimple* registry) {
registry->RegisterIntegerPref(kSigninBottomSheetShownCount, 0);
registry->RegisterIntegerPref(kFRETrialGroupPrefName, 0);
@@ -10,11 +10,10 @@ index 47b7a1fbeaada1e44c2c63f8c7d20186d9d2a851..75f306f0e6e54668a794a39a4fae7bdc
}
void RegisterBrowserStatePrefs(user_prefs::PrefRegistrySyncable* registry) {
@@ -325,6 +326,8 @@ void RegisterBrowserStatePrefs(user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(kSigninAllowedByPolicy, true);
@@ -331,6 +332,7 @@ void RegisterBrowserStatePrefs(user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(kOptimizationGuideRemoteFetchingEnabled, true);
registry->RegisterBooleanPref(kShowReadingListInBookmarkBar, true);
+
registry->RegisterBooleanPref(prefs::kHttpsOnlyModeEnabled, false);
+ BRAVE_REGISTER_BROWSER_STATE_PREFS
}