Merge pull request #10114 from brave/94.0.4606.50_master_118

Upgrade patches from Chromium 94.0.4606.41 to Chromium 94.0.4606.50
brave · Sep 16, 2021 · aa7c989 · aa7c989
1 parent 1cefa60
commit aa7c989
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch
@@ -1,12 +1,12 @@
 diff --git a/chrome/VERSION b/chrome/VERSION
-index 61b828ef70072fc427a713df524c22214a476ee5..cb72876c01c78447d24c932f17b0bb3b4482a05e 100644
+index 3e5542ce16d8f64de418b76927eec2276ed2b00a..cb72876c01c78447d24c932f17b0bb3b4482a05e 100644
 --- a/chrome/VERSION
 +++ b/chrome/VERSION
 @@ -1,4 +1,4 @@
  MAJOR=94
 -MINOR=0
 -BUILD=4606
--PATCH=41
+-PATCH=50
 +MINOR=1
 +BUILD=30
 +PATCH=74
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-index 5dd76d1c7f8999332228c236a5fdb03e87ff2ad0..38908a28ecd5a306cadc72573517d7622f7d00eb 100644
+index 5aa0e513bef79ee77130e4d46662b9d6403abe72..0ab3eeb3582ec6b7cf9e140b45f1078e9938a5e1 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-@@ -2352,6 +2352,7 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+@@ -2340,6 +2340,7 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
      }
 
      private void hideOverview() {

diff --git a/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch b/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
-index 729cb2c061d066fe044ce410c75cb88900d09663..f956eaa11a6d9c8de8ac6c42a5fa8636ab3f8094 100644
+index 19cf18901df225e273de05ed4f54e9ac66395966..2989831cca393150732beffebc4935cb2c77f1c4 100644
 --- a/chrome/browser/flags/android/chrome_feature_list.cc
 +++ b/chrome/browser/flags/android/chrome_feature_list.cc
-@@ -348,6 +348,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+@@ -349,6 +349,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
  };
 
  const base::Feature* FindFeatureExposedToJava(const std::string& feature_name) {

diff --git a/patches/chrome-browser-ui-startup-startup_browser_creator_impl.cc.patch b/patches/chrome-browser-ui-startup-startup_browser_creator_impl.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl.cc b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
-index 714472bc89ccf7de30b1f7129d647fe6e523827a..a6004971f7ff90b63ca85cf0df1e769138e9e672 100644
+index 6b7b6d500ca65276f1f399107dfa629941cfbfdd..c2b81c7f9ba20e8bae36936c60efc1cd7a6b1517 100644
 --- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc
 +++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
-@@ -377,6 +377,7 @@ void StartupBrowserCreatorImpl::DetermineURLsAndLaunch(
+@@ -375,6 +375,7 @@ void StartupBrowserCreatorImpl::DetermineURLsAndLaunch(
  #if !BUILDFLAG(IS_CHROMEOS_ASH)
    welcome_enabled =
        welcome::IsEnabled(profile_) && welcome::HasModulesToShow(profile_);

diff --git a/patches/chrome-browser-ui-views-location_bar-location_icon_view.cc.patch b/patches/chrome-browser-ui-views-location_bar-location_icon_view.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/views/location_bar/location_icon_view.cc b/chrome/browser/ui/views/location_bar/location_icon_view.cc
-index e9bcbf5b4827b63c5dd2597649b035fa33fd5de8..536ef3326e4ef953823685789643793ab9642387 100644
+index 1bf3bb68deea2b9d5e1b3c9ce467f48f7014785e..f5239e6aad702b1ebbe253ee50e636dba0a6667e 100644
 --- a/chrome/browser/ui/views/location_bar/location_icon_view.cc
 +++ b/chrome/browser/ui/views/location_bar/location_icon_view.cc
 @@ -145,6 +145,7 @@ bool LocationIconView::GetShowText() const {

diff --git a/patches/components-browser_ui-widget-android-java-res-values-dimens.xml.patch b/patches/components-browser_ui-widget-android-java-res-values-dimens.xml.patch
@@ -1,5 +1,5 @@
 diff --git a/components/browser_ui/widget/android/java/res/values/dimens.xml b/components/browser_ui/widget/android/java/res/values/dimens.xml
-index be72ffa6c43bbe92bf7e0a7909910d9bb63f0279..656143765257b06790f8cd30138b130ec5cfba77 100644
+index 42489b70d88c8557528fd4d5c36a81e1f9013fce..1974490a020f5f4c29c0448e8ddefdacff697098 100644
 --- a/components/browser_ui/widget/android/java/res/values/dimens.xml
 +++ b/components/browser_ui/widget/android/java/res/values/dimens.xml
 @@ -65,7 +65,7 @@