Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1944)

Unified Diff: android_webview/glue/java/src/com/android/webview/chromium/WebViewContentsClientAdapter.java

Issue 1292923004: Refactor chrome's action mode logics and namings (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: make webview to compile 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 | « no previous file | android_webview/java/src/org/chromium/android_webview/AwContentViewClient.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: android_webview/glue/java/src/com/android/webview/chromium/WebViewContentsClientAdapter.java
diff --git a/android_webview/glue/java/src/com/android/webview/chromium/WebViewContentsClientAdapter.java b/android_webview/glue/java/src/com/android/webview/chromium/WebViewContentsClientAdapter.java
index 19911ff6953811bdaed6fc01516739c1e3ab0ea6..0fa6353a0cd0799cd951ea60175a8e04f21012ec 100644
--- a/android_webview/glue/java/src/com/android/webview/chromium/WebViewContentsClientAdapter.java
+++ b/android_webview/glue/java/src/com/android/webview/chromium/WebViewContentsClientAdapter.java
@@ -51,9 +51,9 @@ import org.chromium.base.TraceEvent;
import org.chromium.content.browser.ContentView;
import org.chromium.content.browser.ContentViewClient;
import org.chromium.content.browser.ContentViewCore;
-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 java.lang.ref.WeakReference;
import java.security.Principal;
@@ -387,15 +387,15 @@ public class WebViewContentsClientAdapter extends AwContentsClient {
* @See AwContentsClient#startActionMode(View,ActionHandler,boolean)
*/
@Override
- public SelectActionMode startActionMode(
+ public WebActionMode startActionMode(
View view, ActionHandler actionHandler, boolean floating) {
try {
TraceEvent.begin("WebViewContentsClientAdapter.startActionMode");
if (TRACE) Log.d(TAG, "startActionMode");
if (floating) return null;
- ActionMode.Callback callback = new SelectActionModeCallback(mContext, actionHandler);
+ ActionMode.Callback callback = new WebActionModeCallback(mContext, actionHandler);
ActionMode actionMode = view.startActionMode(callback);
- return actionMode != null ? new SelectActionMode(actionMode) : null;
+ return actionMode != null ? new WebActionMode(actionMode) : null;
} finally {
TraceEvent.end("WebViewContentsClientAdapter.startActionMode");
}
« no previous file with comments | « no previous file | android_webview/java/src/org/chromium/android_webview/AwContentViewClient.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698