chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/ContextualSearchSupportedLayout.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/ContextualSearchSupportedLayout.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/bottombar/contextualsearch/OverlayPanelContentFactory.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerDocument.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/ContextualSearchSupportedLayout.java

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

index e90453ae72ab9867b8b447d1b8ab5b7fca4acd22..49ae4946970f9cf231c27d29a50e1210e13b3750 100644

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

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

@@ -82,8 +82,7 @@ public abstract class ContextualSearchSupportedLayout extends Layout {

// TODO(dtrainor): If we move ContextualSearch to an overlay, pull the views from there

// instead in Layout.java.

if (mSearchPanel != null && mSearchPanel.getManagementDelegate() != null) {

- ContentViewCore content =

- mSearchPanel.getManagementDelegate().getSearchContentViewCore();

+ ContentViewCore content = mSearchPanel.getContentViewCore();

if (content != null) views.add(content.getContainerView());

}

super.getAllViews(views);

@@ -95,7 +94,7 @@ public abstract class ContextualSearchSupportedLayout extends Layout {

// instead in Layout.java.

if (mSearchPanel != null && mSearchPanel.getManagementDelegate() != null) {

ContentViewCore content =

- mSearchPanel.getManagementDelegate().getSearchContentViewCore();

+ mSearchPanel.getContentViewCore();

if (content != null) contents.add(content);

}

super.getAllContentViewCores(contents);

@@ -152,7 +151,7 @@ public abstract class ContextualSearchSupportedLayout extends Layout {

}

ContentViewCore contentViewCore =

- mSearchPanel.getManagementDelegate().getSearchContentViewCore();

+ mSearchPanel.getContentViewCore();

mContextualSearchSceneLayer.update(contentViewCore, resourceManager);

}