android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellActivity.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: android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellActivity.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

« no previous file with comments | « android_webview/javatests/src/org/chromium/android_webview/test/TestAwContentsClient.java ('k') | android_webview/test/shell/src/org/chromium/android_webview/test/NullContentsClient.java » ('j') | chrome/android/java/src/org/chromium/chrome/browser/tab/ChromeActionModeCallback.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellActivity.java

diff --git a/android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellActivity.java b/android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellActivity.java

index 7f374b834bbe36fcbdbedf5661c00805b6ade913..94c47de8ff712fe2d8f8620a6d449864a1f3c06f 100644

--- a/android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellActivity.java

+++ b/android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellActivity.java

@@ -43,9 +43,9 @@ import org.chromium.base.CommandLine;

import org.chromium.base.Log;

import org.chromium.base.TraceEvent;

import org.chromium.content.app.ContentApplication;

-import org.chromium.content.browser.SelectActionMode;

-import org.chromium.content.browser.SelectActionModeCallback;

-import org.chromium.content.browser.SelectActionModeCallback.ActionHandler;

+import org.chromium.content.browser.WebActionMode;

+import org.chromium.content.browser.WebActionModeCallback;

+import org.chromium.content.browser.WebActionModeCallback.ActionHandler;

import org.chromium.content_public.browser.LoadUrlParams;

import org.chromium.content_public.browser.NavigationController;

import org.chromium.content_public.browser.WebContents;

@@ -167,13 +167,13 @@ public class AwShellActivity extends Activity {

}

@Override

- public SelectActionMode startActionMode(

+ public WebActionMode startActionMode(

View view, ActionHandler actionHandler, boolean floating) {

if (floating) return null;

ActionMode.Callback callback =

- new SelectActionModeCallback(view.getContext(), actionHandler);

+ new WebActionModeCallback(view.getContext(), actionHandler);

ActionMode actionMode = view.startActionMode(callback);

- return actionMode != null ? new SelectActionMode(actionMode) : null;

+ return actionMode != null ? new WebActionMode(actionMode) : null;

}

};