Let embedder provide select action mode

content/public/android/java/src/org/chromium/content/browser/FloatingWebActionModeCallback.java

Index: content/public/android/java/src/org/chromium/content/browser/FloatingWebActionModeCallback.java
diff --git a/content/public/android/java/src/org/chromium/content/browser/FloatingWebActionModeCallback.java b/content/public/android/java/src/org/chromium/content/browser/FloatingWebActionModeCallback.java
index 9749d91b449b969b9088a2439ba535898d39cfdd..765a8cedda931a19e11d4a4a4a65a97283502592 100644
--- a/content/public/android/java/src/org/chromium/content/browser/FloatingWebActionModeCallback.java
+++ b/content/public/android/java/src/org/chromium/content/browser/FloatingWebActionModeCallback.java
@@ -18,36 +18,39 @@ import android.view.View;
  */
 @TargetApi(Build.VERSION_CODES.M)
 public class FloatingWebActionModeCallback extends ActionMode.Callback2 {

[boliu, 2016/11/01 00:37:36]

dunno where to put this.. but WebActionModeCallback.java can be removed, afaict?

[Jinsuk Kim, 2016/11/01 04:43:56]

Yes - removed. And renamed this class a bit.

-    private final WebActionModeCallback mWrappedCallback;
+    private final ActionModeCallbackHelper mHelper;
+    private final ActionMode.Callback mCallback;
 
-    public FloatingWebActionModeCallback(WebActionModeCallback wrappedCallback) {
-        mWrappedCallback = wrappedCallback;
+    public FloatingWebActionModeCallback(ActionModeCallbackHelper helper,
+            ActionMode.Callback callback) {
+        mHelper = helper;
+        mCallback = callback;
     }
 
     @Override
     public boolean onCreateActionMode(ActionMode mode, Menu menu) {
         // If the created ActionMode isn't actually floating, abort creation altogether.
         if (mode.getType() != ActionMode.TYPE_FLOATING) return false;
-        return mWrappedCallback.onCreateActionMode(mode, menu);
+        return mCallback.onCreateActionMode(mode, menu);
     }
 
     @Override
     public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
-        return mWrappedCallback.onPrepareActionMode(mode, menu);
+        return mCallback.onPrepareActionMode(mode, menu);
     }
 
     @Override
     public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
-        return mWrappedCallback.onActionItemClicked(mode, item);
+        return mCallback.onActionItemClicked(mode, item);
     }
 
     @Override
     public void onDestroyActionMode(ActionMode mode) {
-        mWrappedCallback.onDestroyActionMode(mode);
+        mCallback.onDestroyActionMode(mode);
     }
 
     @Override
     public void onGetContentRect(ActionMode mode, View view, Rect outRect) {
-        mWrappedCallback.onGetContentRect(mode, view, outRect);
+        mHelper.onGetContentRect(mode, view, outRect);
     }
 }