diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch index 16730133aa7d..0cf60559d71a 100644 --- a/patches/chrome-VERSION.patch +++ b/patches/chrome-VERSION.patch @@ -1,12 +1,12 @@ diff --git a/chrome/VERSION b/chrome/VERSION -index 66f2dc44203589209cad291151e0d8dd784bcf57..d5348916f2e68d48bc2fe9b9c9a1506539e1fad7 100644 +index 5ccface83986acac44416c37fb272f2e97665210..d2a88f7160a8387056bf032fac44d36284a7744f 100644 --- a/chrome/VERSION +++ b/chrome/VERSION @@ -1,4 +1,4 @@ MAJOR=79 -MINOR=0 -BUILD=3945 --PATCH=74 +-PATCH=79 +MINOR=1 +BUILD=1 +PATCH=20 diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-ToolbarManager.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-ToolbarManager.java.patch index e8814b8b7b21..bb1da76925ec 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-ToolbarManager.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-ToolbarManager.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java -index 72fd16d8323cf2f58e953f7e50c3d6acf20a5294..ef2c84f4fd046843a2cd31f91f5f71b7be195dd5 100644 +index d685d69cd3b481df9f8910e2cf2eb371a5a8a5f3..107212073138e6dec0faafe573b18e5e191c394e 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java -@@ -757,6 +757,7 @@ public class ToolbarManager implements ScrimObserver, ToolbarTabController, UrlF +@@ -760,6 +760,7 @@ public class ToolbarManager implements ScrimObserver, ToolbarTabController, UrlF }; final OnClickListener shareButtonListener = v -> { @@ -10,15 +10,15 @@ index 72fd16d8323cf2f58e953f7e50c3d6acf20a5294..ef2c84f4fd046843a2cd31f91f5f71b7 recordBottomToolbarUseForIPH(); RecordUserAction.record("MobileBottomToolbarShareButton"); boolean isIncognito = false; -@@ -764,6 +765,7 @@ public class ToolbarManager implements ScrimObserver, ToolbarTabController, UrlF +@@ -767,6 +768,7 @@ public class ToolbarManager implements ScrimObserver, ToolbarTabController, UrlF isIncognito = mTabModelSelector.getCurrentTab().isIncognito(); } mActivity.onShareMenuItemSelected(false, isIncognito); +*/ mActivity.addOrEditBookmark(mActivity.getActivityTab()); }; - mBottomControlsCoordinator = new BottomControlsCoordinator(mActivity.getFullscreenManager(), -@@ -1780,6 +1782,7 @@ public class ToolbarManager implements ScrimObserver, ToolbarTabController, UrlF + if (FeatureUtilities.isDuetTabStripIntegrationAndroidEnabled() +@@ -1811,6 +1813,7 @@ public class ToolbarManager implements ScrimObserver, ToolbarTabController, UrlF boolean editingAllowed = currentTab == null || mBookmarkBridge == null || mBookmarkBridge.isEditBookmarksEnabled(); mToolbar.updateBookmarkButton(isBookmarked, editingAllowed); diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-bottom-BottomControlsCoordinator.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-bottom-BottomControlsCoordinator.java.patch index 7f99c4a60d30..090be5120b10 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-bottom-BottomControlsCoordinator.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-bottom-BottomControlsCoordinator.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsCoordinator.java -index 0d3bc64d4da5e8cdf8f1cbaf14840fbc8913b1f9..cb10fdda8c6897abbaf075ef85ecd0986d52218f 100644 +index 4819771fdf58e526bcf30ad7442f2502e2f9e036..00e2a14b7567f12b63681e79dbeef648ac82f990 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsCoordinator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsCoordinator.java -@@ -231,4 +231,5 @@ public class BottomControlsCoordinator { +@@ -236,4 +236,5 @@ public class BottomControlsCoordinator { if (mTabGroupUi != null) mTabGroupUi.destroy(); mMediator.destroy(); } diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-bottom-BottomToolbarCoordinator.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-bottom-BottomToolbarCoordinator.java.patch index 484ea302cfbf..7bf290f64fce 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-bottom-BottomToolbarCoordinator.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-bottom-BottomToolbarCoordinator.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarCoordinator.java -index 4200f0f96ffc14dd43f48672805c4949a26b7719..fdf79e002ce1408c17210b079d7cd1e52f0b9b5f 100644 +index 3e6369a1a9a5f72fc4ef352786aced26c60c0902..f55d8e983f815d8b5e56e007281201df7663e520 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarCoordinator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarCoordinator.java -@@ -135,4 +135,5 @@ class BottomToolbarCoordinator { +@@ -138,4 +138,5 @@ class BottomToolbarCoordinator { } mThemeColorProvider.destroy(); } diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-bottom-BrowsingModeBottomToolbarCoordinator.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-bottom-BrowsingModeBottomToolbarCoordinator.java.patch index 0923ad045380..b6ee25a5c308 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-bottom-BrowsingModeBottomToolbarCoordinator.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-bottom-BrowsingModeBottomToolbarCoordinator.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarCoordinator.java -index c9b1bbc4b15f8dc1cfd52fdbe76c5bd02f44fed3..f8b2075e4a249990d04a24722f4bd76ae081dad5 100644 +index 4535d30d38fcc7ace68618b30dde54c86101b30c..73eabf9e9ebf1b0b72161c107cee249bb7eb2073 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarCoordinator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarCoordinator.java -@@ -38,7 +38,7 @@ public class BrowsingModeBottomToolbarCoordinator { +@@ -39,7 +39,7 @@ public class BrowsingModeBottomToolbarCoordinator { private final HomeButton mHomeButton; /** The share button that lives in the bottom toolbar. */ @@ -11,7 +11,7 @@ index c9b1bbc4b15f8dc1cfd52fdbe76c5bd02f44fed3..f8b2075e4a249990d04a24722f4bd76a /** The search accelerator that lives in the bottom toolbar. */ private final SearchAccelerator mSearchAccelerator; -@@ -178,4 +178,5 @@ public class BrowsingModeBottomToolbarCoordinator { +@@ -185,4 +185,5 @@ public class BrowsingModeBottomToolbarCoordinator { mTabSwitcherButtonCoordinator.destroy(); mMenuButton.destroy(); } diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-util-FeatureUtilities.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-util-FeatureUtilities.java.patch index 2f83a3f3d942..ed32bbd224a3 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-util-FeatureUtilities.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-util-FeatureUtilities.java.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java b/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java -index 1471794e1fc56768c1e0f14d169f2a539ffdef48..b066f328f572627de5540e7fbf332bd4dd2b3a44 100644 +index ee8d2cf102a85b446092ef87759ca13e72f8f867..afded6bea9ccb935d24c8e98f68c98384bb0b639 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java @@ -377,11 +377,13 @@ public class FeatureUtilities { @@ -11,7 +11,7 @@ index 1471794e1fc56768c1e0f14d169f2a539ffdef48..b066f328f572627de5540e7fbf332bd4 return isFlagEnabled(BOTTOM_TOOLBAR_ENABLED_KEY, false) && !DeviceFormFactor.isNonMultiDisplayContextOnTablet( ContextUtils.getApplicationContext()) - && !isTabGroupsAndroidEnabled(); + && (isDuetTabStripIntegrationAndroidEnabled() || !isTabGroupsAndroidEnabled()); +*/ return ChromePreferenceManager.getInstance().isBottomToolbarEnabled(); }