chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerChrome.java - Issue 1489213002: [Contextual Search] Remove layers when no longer needed.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerChrome.java

Issue 1489213002: [Contextual Search] Remove layers when no longer needed. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Addressing comments Created 5 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanel.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerDocument.java » ('j') | chrome/browser/android/compositor/scene_layer/static_tab_scene_layer.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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.