summaryrefslogtreecommitdiffstats
path: root/android_webview/java
diff options
context:
space:
mode:
authorianwen <ianwen@chromium.org>2015-08-19 14:38:23 -0700
committerCommit bot <commit-bot@chromium.org>2015-08-19 21:39:03 +0000
commit6b5e238f0ee7db98535c3b459d0a14194efccfc3 (patch)
tree2417d24d038dd773dc950197e8d8635d03dc7dd0 /android_webview/java
parent7425951dbe9c6732b56e10058f018277a20573fd (diff)
downloadchromium_src-6b5e238f0ee7db98535c3b459d0a14194efccfc3.zip
chromium_src-6b5e238f0ee7db98535c3b459d0a14194efccfc3.tar.gz
chromium_src-6b5e238f0ee7db98535c3b459d0a14194efccfc3.tar.bz2
Refactor chrome's action mode logics and namings
ActionMode is the standard naming for the copy-paste-select bar in android. (http://developer.android.com/guide/topics/ui/menus.html) In chrome on android, three types of ActionMode exist: 1. ContextualMenuBar and CustomSelectionActionModeCallback. This is for toolbar and omnibox editing. On tablet, ContextualMenuBar controls the animation to move toolbar downwards, hiding the tabstrip. 2. SelectionActionModeCallback and SelectionActionMode are content layer concept for selecting strings inside of the webcontents. 3. ChromeSelectActionModeCallback is the same thing in chrome layer. To make our naming more clear and more intuitive, several renamings are proposed in this CL: 1. ContextualMenuBar -> ActionModeController. This class only handles animation for toolbar, and it is essentially a controller/manager. 2. CustomSelectionActionModeCallback -> ToolbarActionModeCallback. This callback only serves content editing in toolbar and omnibox. 3. SelectActionMode -> WebActionMode; SelectActionModeCallback -> WebActionModeCallback. This renaming is to distinguish between webcontents and android native views. This CL also removes the unused code in ChromeTabbedActivity. BUG=521194 Review URL: https://codereview.chromium.org/1292923004 Cr-Commit-Position: refs/heads/master@{#344336}
Diffstat (limited to 'android_webview/java')
-rw-r--r--android_webview/java/src/org/chromium/android_webview/AwContentViewClient.java6
-rw-r--r--android_webview/java/src/org/chromium/android_webview/AwContentsClient.java6
2 files changed, 6 insertions, 6 deletions
diff --git a/android_webview/java/src/org/chromium/android_webview/AwContentViewClient.java b/android_webview/java/src/org/chromium/android_webview/AwContentViewClient.java
index 880d3a1..fb5b55d6 100644
--- a/android_webview/java/src/org/chromium/android_webview/AwContentViewClient.java
+++ b/android_webview/java/src/org/chromium/android_webview/AwContentViewClient.java
@@ -13,8 +13,8 @@ import android.widget.FrameLayout;
import org.chromium.content.browser.ContentVideoViewClient;
import org.chromium.content.browser.ContentViewClient;
-import org.chromium.content.browser.SelectActionMode;
-import org.chromium.content.browser.SelectActionModeCallback.ActionHandler;
+import org.chromium.content.browser.WebActionMode;
+import org.chromium.content.browser.WebActionModeCallback.ActionHandler;
/**
* ContentViewClient implementation for WebView
@@ -70,7 +70,7 @@ public class AwContentViewClient extends ContentViewClient implements ContentVid
}
@Override
- public SelectActionMode startActionMode(
+ public WebActionMode startActionMode(
View view, ActionHandler actionHandler, boolean floating) {
return mAwContentsClient.startActionMode(view, actionHandler, floating);
}
diff --git a/android_webview/java/src/org/chromium/android_webview/AwContentsClient.java b/android_webview/java/src/org/chromium/android_webview/AwContentsClient.java
index e23285d..153cc82 100644
--- a/android_webview/java/src/org/chromium/android_webview/AwContentsClient.java
+++ b/android_webview/java/src/org/chromium/android_webview/AwContentsClient.java
@@ -28,8 +28,8 @@ import org.chromium.android_webview.permission.AwPermissionRequest;
import org.chromium.base.Log;
import org.chromium.base.annotations.SuppressFBWarnings;
import org.chromium.content.browser.ContentViewCore;
-import org.chromium.content.browser.SelectActionMode;
-import org.chromium.content.browser.SelectActionModeCallback.ActionHandler;
+import org.chromium.content.browser.WebActionMode;
+import org.chromium.content.browser.WebActionModeCallback.ActionHandler;
import java.security.Principal;
import java.util.HashMap;
@@ -373,7 +373,7 @@ public abstract class AwContentsClient {
*/
public abstract void onNewPicture(Picture picture);
- public abstract SelectActionMode startActionMode(
+ public abstract WebActionMode startActionMode(
View view, ActionHandler actionHandler, boolean floating);
public abstract boolean supportsFloatingActionMode();