Check for grid tab switcher in TopToolbarOverlay

This patch checks if the grid is showing for the top toolbar's overlay
as the visual logic in that class is for the stack. This should be a
temporary measure until each layout has its own type.

Bug: 1147801
Change-Id: I2a61c992febe6307c64ea3a9462fce955a7c9027
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2535811Reviewed-by: Mei Liang <meiliang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#827384}

chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/toolbar/TopToolbarOverlayMediator.java

@@ -19,6 +19,7 @@ import org.chromium.chrome.browser.layouts.LayoutType;
 import org.chromium.chrome.browser.tab.EmptyTabObserver;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tab.TabObserver;
+import org.chromium.chrome.browser.tasks.tab_management.TabUiFeatureUtilities;
 import org.chromium.chrome.browser.toolbar.ToolbarColors;
 import org.chromium.components.browser_ui.widget.ClipDrawableProgressBar;
 import org.chromium.ui.base.DeviceFormFactor;
@@ -84,8 +85,9 @@ public class TopToolbarOverlayMediator {
             public void onStartedShowing(@LayoutType int layout, boolean showToolbar) {
                 // TODO(1100332): Once ToolbarSwipeLayout uses a SceneLayer that does not include
                 //                its own toolbar, only check for the vertical tab switcher.
-                mLayoutHasOwnToolbar =
-                        layout == LayoutType.TAB_SWITCHER || layout == LayoutType.TOOLBAR_SWIPE;
+                mLayoutHasOwnToolbar = (layout == LayoutType.TAB_SWITCHER
+                                               && !TabUiFeatureUtilities.isGridTabSwitcherEnabled())
+                        || layout == LayoutType.TOOLBAR_SWIPE;
                 updateVisibility();
             }
         };