chrome/android/java/src/org/chromium/chrome/browser/toolbar/CustomTabToolbar.java - Issue 1292923004: Refactor chrome's action mode logics and namings

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/CustomTabToolbar.java

Issue 1292923004: Refactor chrome's action mode logics and namings (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 4 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

« chrome/android/java/src/org/chromium/chrome/browser/toolbar/ActionModeController.java ('K') | « chrome/android/java/src/org/chromium/chrome/browser/toolbar/ActionModeController.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarActionModeCallback.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/CustomTabToolbar.java

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

index 83b6525c6f3f55a32a4e3f5549832fbae6422d34..c4bff45fd596004c1c2fb7a208ec5a238c7c2a5b 100644

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

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

@@ -25,8 +25,6 @@ import android.widget.TextView;

import org.chromium.base.ApiCompatibilityUtils;

import org.chromium.base.VisibleForTesting;

import org.chromium.chrome.R;

-import org.chromium.chrome.browser.ContextualMenuBar.ActionBarDelegate;

-import org.chromium.chrome.browser.CustomSelectionActionModeCallback;

import org.chromium.chrome.browser.WebsiteSettingsPopup;

import org.chromium.chrome.browser.WindowDelegate;

import org.chromium.chrome.browser.appmenu.AppMenuButtonHelper;

@@ -43,6 +41,7 @@ import org.chromium.chrome.browser.profiles.Profile;

import org.chromium.chrome.browser.ssl.ConnectionSecurityLevel;

import org.chromium.chrome.browser.tab.ChromeTab;

import org.chromium.chrome.browser.tab.Tab;

+import org.chromium.chrome.browser.toolbar.ActionModeController.ActionBarDelegate;

import org.chromium.chrome.browser.widget.TintedDrawable;

import org.chromium.components.dom_distiller.core.DomDistillerService;

import org.chromium.components.dom_distiller.core.DomDistillerUrlUtils;

@@ -373,7 +372,7 @@ public class CustomTabToolbar extends ToolbarLayout implements LocationBar,

}

@Override

- public void setDefaultTextEditActionModeCallback(CustomSelectionActionModeCallback callback) {

+ public void setDefaultTextEditActionModeCallback(ToolbarActionModeCallback callback) {

mUrlBar.setCustomSelectionActionModeCallback(callback);

}