Index: chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerChrome.java |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerChrome.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerChrome.java |
index dbe8b3dbce9e3a2e4ebd58d1562f9b3dc57f0e9c..b7ebb30d71d92c62cdbbcc256060d13d2edcd171 100644 |
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerChrome.java |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerChrome.java |
@@ -13,6 +13,7 @@ import org.chromium.base.ObserverList; |
import org.chromium.base.VisibleForTesting; |
import org.chromium.chrome.R; |
import org.chromium.chrome.browser.compositor.TitleCache; |
+import org.chromium.chrome.browser.compositor.bottombar.OverlayPanel; |
import org.chromium.chrome.browser.compositor.layouts.components.LayoutTab; |
import org.chromium.chrome.browser.compositor.layouts.components.VirtualView; |
import org.chromium.chrome.browser.compositor.layouts.content.TabContentManager; |
@@ -366,11 +367,14 @@ public class LayoutManagerChrome |
Layout layoutBeingShown = getActiveLayout(); |
- // Check if a layout is showing that should hide the contextual search bar. |
- if (mContextualSearchDelegate != null |
+ // Check if a layout is showing that should hide the OverlayPanel. |
+ if (mOverlayPanelManager != null |
&& (isOverviewLayout(layoutBeingShown) |
|| layoutBeingShown == mToolbarSwipeLayout)) { |
- mContextualSearchDelegate.dismissContextualSearchBar(); |
+ OverlayPanel panel = mOverlayPanelManager.getActivePanel(); |
+ if (panel != null) { |
+ panel.closePanel(OverlayPanel.StateChangeReason.UNKNOWN, false); |
+ } |
} |
// Check if we should notify OverviewModeObservers. |