chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManager.java - Issue 2443613002: Rename classes related to top controls

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/contextualsearch/ContextualSearchManager.java

Issue 2443613002: Rename classes related to top controls (Closed)

Patch Set: fix test Created 4 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/contextualsearch/BarOverlapTapSuppression.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabDelegateFactory.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/contextualsearch/ContextualSearchManager.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManager.java b/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManager.java

index bf6e5b0a0f7b0999bf8d69db2c3e9dbc50df5164..505fb0f29ebee041c118ba6e6922fa9ebcf99df1 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManager.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManager.java

@@ -47,7 +47,7 @@ import org.chromium.content_public.browser.GestureStateListener;

import org.chromium.content_public.browser.LoadUrlParams;

import org.chromium.content_public.browser.NavigationEntry;

import org.chromium.content_public.browser.WebContents;

-import org.chromium.content_public.common.TopControlsState;

+import org.chromium.content_public.common.BrowserControlsState;

import org.chromium.net.NetworkChangeNotifier;

import org.chromium.ui.base.WindowAndroid;

@@ -907,7 +907,7 @@ public class ContextualSearchManager implements ContextualSearchManagementDelega

@Override

public void onMainFrameLoadStarted(String url, boolean isExternalUrl) {

- mSearchPanel.updateTopControlsState();

+ mSearchPanel.updateBrowserControlsState();

if (isExternalUrl) {

onExternalNavigation(url);

@@ -1214,7 +1214,7 @@ public class ContextualSearchManager implements ContextualSearchManagementDelega

public void onSelectionChanged(String selection) {

if (!isOverlayVideoMode()) {

mSelectionController.handleSelectionChanged(selection);

- mSearchPanel.updateTopControlsState(TopControlsState.BOTH, true);

+ mSearchPanel.updateBrowserControlsState(BrowserControlsState.BOTH, true);

}