chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/phone/ContextualSearchLayout.java - Issue 1372963005: Separate ContextualSearchPanel from OverlayPanel

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/phone/ContextualSearchLayout.java

Issue 1372963005: Separate ContextualSearchPanel from OverlayPanel (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@rebase-extract-management-delegate

Patch Set: fix redundant null check Created 5 years, 2 months 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/layouts/eventfilter/ContextualSearchEventFilter.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManagementDelegate.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/phone/ContextualSearchLayout.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/phone/ContextualSearchLayout.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/phone/ContextualSearchLayout.java

index e9c277269844cc300ddefa4fe12621d108a441c8..3b00d67c028fa8e207186235157386443d2e21a9 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/phone/ContextualSearchLayout.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/phone/ContextualSearchLayout.java

@@ -9,8 +9,8 @@ import android.graphics.Rect;

import android.view.View;

import org.chromium.chrome.browser.compositor.LayerTitleCache;

+import org.chromium.chrome.browser.compositor.bottombar.OverlayPanel.StateChangeReason;

import org.chromium.chrome.browser.compositor.bottombar.contextualsearch.ContextualSearchPanel;

-import org.chromium.chrome.browser.compositor.bottombar.contextualsearch.ContextualSearchPanel.StateChangeReason;

import org.chromium.chrome.browser.compositor.layouts.ContextualSearchSupportedLayout;

import org.chromium.chrome.browser.compositor.layouts.Layout;

import org.chromium.chrome.browser.compositor.layouts.LayoutRenderHost;

@@ -61,7 +61,7 @@ public class ContextualSearchLayout extends ContextualSearchSupportedLayout {

@Override

public View getViewForInteraction() {

- ContentViewCore content = mSearchPanel.getManagementDelegate().getSearchContentViewCore();

+ ContentViewCore content = mSearchPanel.getContentViewCore();

if (content != null) return content.getContainerView();

return super.getViewForInteraction();

}