Skip to content

Commit 4a2f52f

Browse files
bscliftonbsclifton
authored
Merge pull request #4207 from brave/79.0.3945.79
Upgrade from Chromium 79.0.3945.74 to Chromium 79.0.3945.79
2 parents ef7e47a + 02cfb33 commit 4a2f52f

7 files changed

+23
-21
lines changed

‎android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarCoordinator.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import android.content.res.Resources;
1010
import android.view.View;
1111
import android.view.View.OnClickListener;
12+
import android.view.View.OnLongClickListener;
1213
import android.view.ViewGroup;
1314
import android.view.ViewStub;
1415

@@ -34,9 +35,10 @@ public class BraveBottomToolbarCoordinator
3435

3536
BraveBottomToolbarCoordinator(ViewStub stub, ActivityTabProvider tabProvider,
3637
OnClickListener homeButtonListener, OnClickListener searchAcceleratorListener,
37-
OnClickListener shareButtonListener, ThemeColorProvider themeColorProvider) {
38+
OnClickListener shareButtonListener, OnLongClickListener tabsSwitcherLongClickListner,
39+
ThemeColorProvider themeColorProvider) {
3840
super(stub, tabProvider, homeButtonListener, searchAcceleratorListener, shareButtonListener,
39-
themeColorProvider);
41+
tabsSwitcherLongClickListner, themeColorProvider);
4042
}
4143

4244
@Override

‎patches/chrome-VERSION.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
diff --git a/chrome/VERSION b/chrome/VERSION
2-
index 66f2dc44203589209cad291151e0d8dd784bcf57..77c21636c91febbeaf759a025ff9ab8d738bccb7 100644
2+
index 5ccface83986acac44416c37fb272f2e97665210..8cf28f7d51597b2d5debce2304124856e84a5e61 100644
33
--- a/chrome/VERSION
44
+++ b/chrome/VERSION
55
@@ -1,4 +1,4 @@
66
MAJOR=79
77
-MINOR=0
88
-BUILD=3945
9-
-PATCH=74
9+
-PATCH=79
1010
+MINOR=1
1111
+BUILD=4
1212
+PATCH=21

‎patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-ToolbarManager.java.patch

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
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
2-
index 72fd16d8323cf2f58e953f7e50c3d6acf20a5294..ef2c84f4fd046843a2cd31f91f5f71b7be195dd5 100644
2+
index d685d69cd3b481df9f8910e2cf2eb371a5a8a5f3..107212073138e6dec0faafe573b18e5e191c394e 100644
33
--- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
44
+++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
5-
@@ -757,6 +757,7 @@ public class ToolbarManager implements ScrimObserver, ToolbarTabController, UrlF
5+
@@ -760,6 +760,7 @@ public class ToolbarManager implements ScrimObserver, ToolbarTabController, UrlF
66
};
77

88
final OnClickListener shareButtonListener = v -> {
99
+/*
1010
recordBottomToolbarUseForIPH();
1111
RecordUserAction.record("MobileBottomToolbarShareButton");
1212
boolean isIncognito = false;
13-
@@ -764,6 +765,7 @@ public class ToolbarManager implements ScrimObserver, ToolbarTabController, UrlF
13+
@@ -767,6 +768,7 @@ public class ToolbarManager implements ScrimObserver, ToolbarTabController, UrlF
1414
isIncognito = mTabModelSelector.getCurrentTab().isIncognito();
1515
}
1616
mActivity.onShareMenuItemSelected(false, isIncognito);
1717
+*/ mActivity.addOrEditBookmark(mActivity.getActivityTab());
1818
};
1919

20-
mBottomControlsCoordinator = new BottomControlsCoordinator(mActivity.getFullscreenManager(),
21-
@@ -1780,6 +1782,7 @@ public class ToolbarManager implements ScrimObserver, ToolbarTabController, UrlF
20+
if (FeatureUtilities.isDuetTabStripIntegrationAndroidEnabled()
21+
@@ -1811,6 +1813,7 @@ public class ToolbarManager implements ScrimObserver, ToolbarTabController, UrlF
2222
boolean editingAllowed = currentTab == null || mBookmarkBridge == null
2323
|| mBookmarkBridge.isEditBookmarksEnabled();
2424
mToolbar.updateBookmarkButton(isBookmarked, editingAllowed);

‎patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-bottom-BottomControlsCoordinator.java.patch

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
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
2-
index 0d3bc64d4da5e8cdf8f1cbaf14840fbc8913b1f9..b4831fca19a9f597b74cb0c57a4c1df90e1beb0a 100644
2+
index 4819771fdf58e526bcf30ad7442f2502e2f9e036..8e2514d14c4cbc9538580fc437cbf947613cd02d 100644
33
--- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsCoordinator.java
44
+++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsCoordinator.java
5-
@@ -102,7 +102,7 @@ public class BottomControlsCoordinator {
5+
@@ -106,7 +106,7 @@ public class BottomControlsCoordinator {
66
mTabGroupUi = TabManagementModuleProvider.getDelegate().createTabGroupUi(
77
root.findViewById(R.id.bottom_container_slot), themeColorProvider);
88
} else {
99
- mBottomToolbarCoordinator = new BottomToolbarCoordinator(
1010
+ mBottomToolbarCoordinator = new BraveBottomToolbarCoordinator(
1111
root.findViewById(R.id.bottom_toolbar_stub), tabProvider, homeButtonListener,
12-
searchAcceleratorListener, shareButtonListener, themeColorProvider);
13-
}
14-
@@ -231,4 +231,5 @@ public class BottomControlsCoordinator {
12+
searchAcceleratorListener, shareButtonListener, tabSwitcherLongClickListener,
13+
themeColorProvider);
14+
@@ -236,4 +236,5 @@ public class BottomControlsCoordinator {
1515
if (mTabGroupUi != null) mTabGroupUi.destroy();
1616
mMediator.destroy();
1717
}

‎patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-bottom-BottomToolbarCoordinator.java.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
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
2-
index 4200f0f96ffc14dd43f48672805c4949a26b7719..fdf79e002ce1408c17210b079d7cd1e52f0b9b5f 100644
2+
index 3e6369a1a9a5f72fc4ef352786aced26c60c0902..f55d8e983f815d8b5e56e007281201df7663e520 100644
33
--- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarCoordinator.java
44
+++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarCoordinator.java
5-
@@ -135,4 +135,5 @@ class BottomToolbarCoordinator {
5+
@@ -138,4 +138,5 @@ class BottomToolbarCoordinator {
66
}
77
mThemeColorProvider.destroy();
88
}

‎patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-bottom-BrowsingModeBottomToolbarCoordinator.java.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
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
2-
index c9b1bbc4b15f8dc1cfd52fdbe76c5bd02f44fed3..f8b2075e4a249990d04a24722f4bd76ae081dad5 100644
2+
index 4535d30d38fcc7ace68618b30dde54c86101b30c..73eabf9e9ebf1b0b72161c107cee249bb7eb2073 100644
33
--- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarCoordinator.java
44
+++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarCoordinator.java
5-
@@ -38,7 +38,7 @@ public class BrowsingModeBottomToolbarCoordinator {
5+
@@ -39,7 +39,7 @@ public class BrowsingModeBottomToolbarCoordinator {
66
private final HomeButton mHomeButton;
77

88
/** The share button that lives in the bottom toolbar. */
@@ -11,7 +11,7 @@ index c9b1bbc4b15f8dc1cfd52fdbe76c5bd02f44fed3..f8b2075e4a249990d04a24722f4bd76a
1111

1212
/** The search accelerator that lives in the bottom toolbar. */
1313
private final SearchAccelerator mSearchAccelerator;
14-
@@ -178,4 +178,5 @@ public class BrowsingModeBottomToolbarCoordinator {
14+
@@ -185,4 +185,5 @@ public class BrowsingModeBottomToolbarCoordinator {
1515
mTabSwitcherButtonCoordinator.destroy();
1616
mMenuButton.destroy();
1717
}

‎patches/chrome-android-java-src-org-chromium-chrome-browser-util-FeatureUtilities.java.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
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
2-
index 1471794e1fc56768c1e0f14d169f2a539ffdef48..73e70053b280f9fa6cc2d30b0d56d73435f25525 100644
2+
index ee8d2cf102a85b446092ef87759ca13e72f8f867..340db4f2dbe9549f13db25a460d96a8889ebd64f 100644
33
--- a/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java
44
+++ b/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java
55
@@ -378,7 +378,7 @@ public class FeatureUtilities {
@@ -10,7 +10,7 @@ index 1471794e1fc56768c1e0f14d169f2a539ffdef48..73e70053b280f9fa6cc2d30b0d56d734
1010
+ return ChromePreferenceManager.getInstance().isBottomToolbarEnabled()
1111
&& !DeviceFormFactor.isNonMultiDisplayContextOnTablet(
1212
ContextUtils.getApplicationContext())
13-
&& !isTabGroupsAndroidEnabled();
13+
&& (isDuetTabStripIntegrationAndroidEnabled() || !isTabGroupsAndroidEnabled());
1414
@@ -423,7 +423,7 @@ public class FeatureUtilities {
1515
* enabled).
1616
*/

0 commit comments

Comments
 (0)