Merge pull request #9372 from brave/92.0.4515.93_master_107

Upgrade patches from Chromium 92.0.4515.81 to Chromium 92.0.4515.93

android/java/org/chromium/chrome/browser/settings/AppearancePreferences.java

@@ -104,7 +104,7 @@ public class AppearancePreferences extends BravePreferenceFragment
         enableTabGroups.setOnPreferenceChangeListener(this);
         if (enableTabGroups instanceof ChromeSwitchPreference) {
             ((ChromeSwitchPreference) enableTabGroups)
-                    .setChecked(TabUiFeatureUtilities.isTabGroupsAndroidEnabled());
+                    .setChecked(TabUiFeatureUtilities.isTabGroupsAndroidEnabled(getActivity()));
         }
     }
 

android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java

@@ -202,7 +202,7 @@ public class BraveToolbarManager extends ToolbarManager {
                     (ViewStub) mActivity.findViewById(R.id.bottom_controls_stub);
             mBottomControls =
                     (BraveScrollingBottomViewResourceFrameLayout) bottomControlsStub.inflate();
-            if (TabUiFeatureUtilities.isTabGroupsAndroidEnabled()
+            if (TabUiFeatureUtilities.isTabGroupsAndroidEnabled(mActivity)
                     || TabUiFeatureUtilities.isConditionalTabStripEnabled()) {
                 mTabGroupUi = TabManagementModuleProvider.getDelegate().createTabGroupUi(mActivity,
                         mBottomControls.findViewById(R.id.bottom_container_slot),

android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarCoordinator.java

@@ -37,6 +37,7 @@ import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tabmodel.IncognitoStateProvider;
 import org.chromium.chrome.browser.tasks.ReturnToChromeExperimentsUtil;
+import org.chromium.chrome.browser.tasks.tab_management.TabUiFeatureUtilities;
 import org.chromium.chrome.browser.theme.ThemeColorProvider;
 import org.chromium.chrome.browser.toolbar.HomeButton;
 import org.chromium.chrome.browser.toolbar.TabCountProvider;
@@ -157,9 +158,11 @@ class BottomToolbarCoordinator implements View.OnLongClickListener {
                 topToolbarRoot, incognitoStateProvider, mThemeColorProvider, newTabClickListener,
                 closeTabsClickListener, mMenuButtonHelperSupplier, tabCountProvider);
 
+        ChromeActivity activity = BraveActivity.getBraveActivity();
         // Do not change bottom bar if StartSurface Single Pane is enabled and HomePage is not
         // customized.
-        if (!ReturnToChromeExperimentsUtil.shouldShowStartSurfaceAsTheHomePage()
+        if (!ReturnToChromeExperimentsUtil.shouldShowStartSurfaceAsTheHomePage(
+                    activity != null ? activity : mContext)
                 && BottomToolbarVariationManager.shouldBottomToolbarBeVisibleInOverviewMode()) {
             mLayoutStateObserver = new LayoutStateProvider.LayoutStateObserver() {
                 @Override
@@ -252,7 +255,6 @@ class BottomToolbarCoordinator implements View.OnLongClickListener {
             mNewTabButton.setOnLongClickListener(this);
         }
 
-        ChromeActivity activity = BraveActivity.getBraveActivity();
         if (mScrollingBottomView != null && activity != null) {
             mScrollingBottomView.setSwipeDetector(
                     activity.getCompositorViewHolder().getLayoutManager().getToolbarSwipeHandler());
@@ -264,7 +266,10 @@ class BottomToolbarCoordinator implements View.OnLongClickListener {
      */
     void setBottomToolbarVisible(boolean isVisible) {
         if (mTabSwitcherModeCoordinator != null) {
-            mTabSwitcherModeCoordinator.showToolbarOnTop(!isVisible);
+            ChromeActivity activity = BraveActivity.getBraveActivity();
+            mTabSwitcherModeCoordinator.showToolbarOnTop(!isVisible,
+                    TabUiFeatureUtilities.isGridTabSwitcherEnabled(
+                            activity != null ? activity : mContext));
         }
         mBrowsingModeCoordinator.onVisibilityChanged(isVisible);
     }

android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarCoordinator.java

@@ -95,8 +95,8 @@ public class TabSwitcherBottomToolbarCoordinator {
     /**
      * @param showOnTop Whether to show the tab switcher bottom toolbar on the top of the screen.
      */
-    void showToolbarOnTop(boolean showOnTop) {
-        mMediator.showToolbarOnTop(showOnTop);
+    void showToolbarOnTop(boolean showOnTop, boolean isGridTabSwitcherEnabled) {
+        mMediator.showToolbarOnTop(showOnTop, isGridTabSwitcherEnabled);
     }
 
     /**

android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarMediator.java

@@ -5,7 +5,6 @@
 
 package org.chromium.chrome.browser.toolbar.bottom;
 
-import org.chromium.chrome.browser.tasks.tab_management.TabUiFeatureUtilities;
 import org.chromium.chrome.browser.theme.ThemeColorProvider;
 import org.chromium.chrome.browser.theme.ThemeColorProvider.ThemeColorObserver;
 
@@ -38,13 +37,13 @@ class TabSwitcherBottomToolbarMediator implements ThemeColorObserver {
     /**
      * @param showOnTop Whether to show the tab switcher bottom toolbar on the top of the screen.
      */
-    void showToolbarOnTop(boolean showOnTop) {
+    void showToolbarOnTop(boolean showOnTop, boolean isGridTabSwitcherEnabled) {
         // TODO(crbug.com/1012014): Resolve how to manage the toolbar position in tab switcher in
         // landscape mode. Probably remove code about showing bottom toolbar on top.
         // When GridTabSwitcher is enabled, show the original top toolbar instead of showing the
         // bottom toolbar on top.
-        mModel.set(TabSwitcherBottomToolbarModel.SHOW_ON_TOP,
-                showOnTop && !TabUiFeatureUtilities.isGridTabSwitcherEnabled());
+        mModel.set(
+                TabSwitcherBottomToolbarModel.SHOW_ON_TOP, showOnTop && !isGridTabSwitcherEnabled);
     }
 
     /**