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

Unified Diff: content/public/android/java/src/org/chromium/content/browser/ContentViewClient.java

Issue 10828098: Upstreaming Select Action (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Brett's nits fixed Created 8 years, 5 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
Index: content/public/android/java/src/org/chromium/content/browser/ContentViewClient.java
diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentViewClient.java b/content/public/android/java/src/org/chromium/content/browser/ContentViewClient.java
index 1d789f687ee6b4be2badb1cc4ce72ce41cdbd8fc..0e830acc086d67e70970f7e037506a97f7623896 100644
--- a/content/public/android/java/src/org/chromium/content/browser/ContentViewClient.java
+++ b/content/public/android/java/src/org/chromium/content/browser/ContentViewClient.java
@@ -10,12 +10,14 @@ import android.content.Intent;
import android.graphics.Rect;
import android.graphics.RectF;
import android.util.Log;
+import android.view.ActionMode;
import android.view.KeyEvent;
import org.chromium.base.AccessedByNative;
import org.chromium.base.CalledByNative;
import org.chromium.base.JNINamespace;
import org.chromium.content.browser.ContentHttpAuthHandler;
+import org.chromium.content.browser.SelectActionModeCallback.ActionHandler;
import java.net.URISyntaxException;
@@ -265,6 +267,14 @@ public class ContentViewClient {
}
/**
+ * Returns an ActionMode.Callback for in-page selection.
+ */
+ public ActionMode.Callback getSelectActionModeCallback(
+ Context context, ActionHandler actionHandler, boolean incognito) {
+ return new SelectActionModeCallback(context, actionHandler, incognito);
+ }
+
+ /**
* Called when the contextual ActionBar is shown.
*/
public void onContextualActionBarShown() {

Powered by Google App Engine
This is Rietveld 408576698