chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java - Issue 2652883002: Omnibox results show correctly for Chrome Home

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/toolbar/ToolbarManager.java

Issue 2652883002: Omnibox results show correctly for Chrome Home (Closed)

Patch Set: address comments Created 3 years, 11 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/toolbar/BottomToolbarPhone.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/widget/BottomSheet.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/toolbar/ToolbarManager.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java

index 1b771ee204de7f466bc69fdbfe3fe7fe260260b4..73e32d0886a2d261229d15f61ef49449db4edbce 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java

@@ -201,7 +201,7 @@ public class ToolbarManager implements ToolbarTabController, UrlFocusChangeListe

mToolbar = (ToolbarLayout) controlContainer.findViewById(R.id.toolbar);

mToolbar.setPaintInvalidator(invalidator);

- mToolbar.setBottomSheet(activity.getBottomSheet());

+ if (activity.getBottomSheet() != null) mToolbar.setBottomSheet(activity.getBottomSheet());

mActionModeController = new ActionModeController(activity, mActionBarDelegate);

mActionModeController.setCustomSelectionActionModeCallback(