Add ContextMenu support upstream for Android

Add ContextMenu support upstream for Android

Move and rework the ContextMenu files upstream so they are built and reside in TabBase.

BUG=277135
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=239076

[David Trainor- moved to gerrit, 2013-11-15 19:10:11]

ptal

[Ted C, 2013-11-19 02:44:00]

https://codereview.chromium.org/73173002/diff/20001/chrome/android/java/src/o...
File chrome/android/java/src/org/chromium/chrome/browser/TabBase.java (right):

https://codereview.chromium.org/73173002/diff/20001/chrome/android/java/src/o...
chrome/android/java/src/org/chromium/chrome/browser/TabBase.java:824: 
there isn't any blank lines between the other native methods, so probably
shouldn't have one here.

https://codereview.chromium.org/73173002/diff/20001/chrome/android/java/src/o...
File
chrome/android/java/src/org/chromium/chrome/browser/context_menu/ChromeContextMenuItemDelegate.java
(right):

https://codereview.chromium.org/73173002/diff/20001/chrome/android/java/src/o...
chrome/android/java/src/org/chromium/chrome/browser/context_menu/ChromeContextMenuItemDelegate.java:5:
package org.chromium.chrome.browser.context_menu;
normally there aren't _'s in java package names.  Should probably just be
contextmenu

https://codereview.chromium.org/73173002/diff/20001/chrome/android/java/src/o...
chrome/android/java/src/org/chromium/chrome/browser/context_menu/ChromeContextMenuItemDelegate.java:14:
public boolean isIncognito();
public isn't needed in interface descriptions

https://codereview.chromium.org/73173002/diff/20001/chrome/android/java/src/o...
chrome/android/java/src/org/chromium/chrome/browser/context_menu/ChromeContextMenuItemDelegate.java:28:
* Called when {@code url} should be opened in a new tab with the same incognito
state as the
when [the] {@code url}

?? same other places

https://codereview.chromium.org/73173002/diff/20001/chrome/android/java/src/o...
chrome/android/java/src/org/chromium/chrome/browser/context_menu/ChromeContextMenuItemDelegate.java:29:
* current {@link ContentView}.
TabBase ?

https://codereview.chromium.org/73173002/diff/20001/chrome/android/java/src/o...
File
chrome/android/java/src/org/chromium/chrome/browser/context_menu/ContextMenuHelper.java
(right):

https://codereview.chromium.org/73173002/diff/20001/chrome/android/java/src/o...
chrome/android/java/src/org/chromium/chrome/browser/context_menu/ContextMenuHelper.java:56:
* @param contentViewCore
missing description

https://codereview.chromium.org/73173002/diff/20001/chrome/android/java/src/o...
File
chrome/android/java/src/org/chromium/chrome/browser/context_menu/ContextMenuParams.java
(right):

https://codereview.chromium.org/73173002/diff/20001/chrome/android/java/src/o...
chrome/android/java/src/org/chromium/chrome/browser/context_menu/ContextMenuParams.java:18:
@JNINamespace("AndroidContextMenuParams")
I think Android typically goes at the end.

https://codereview.chromium.org/73173002/diff/20001/chrome/android/java/src/o...
chrome/android/java/src/org/chromium/chrome/browser/context_menu/ContextMenuParams.java:32:
private final String mLabel;
if these are just internal, I would just make them public and drop the m prefix
(and get rid of the accessors).

https://codereview.chromium.org/73173002/diff/20001/chrome/android/java/src/o...
chrome/android/java/src/org/chromium/chrome/browser/context_menu/ContextMenuParams.java:66:
return mCustomMenuItems.size() > 0;
isEmpty()

https://codereview.chromium.org/73173002/diff/20001/chrome/browser/android/ta...
File chrome/browser/android/tab_android.cc (right):

https://codereview.chromium.org/73173002/diff/20001/chrome/browser/android/ta...
chrome/browser/android/tab_android.cc:416:
ContextMenuHelper::FromWebContents(web_contents());
Maybe this could just be moved to ContextMenuHelper?  It already has a pointer
to the web_contents, so it should be pretty self contained over there.

https://codereview.chromium.org/73173002/diff/20001/chrome/browser/android/ta...
File chrome/browser/android/tab_android.h (right):

https://codereview.chromium.org/73173002/diff/20001/chrome/browser/android/ta...
chrome/browser/android/tab_android.h:138: // TODO: Move out?
seems a bit lacking

https://codereview.chromium.org/73173002/diff/20001/chrome/browser/ui/android...
File chrome/browser/ui/android/context_menu_helper.cc (right):

https://codereview.chromium.org/73173002/diff/20001/chrome/browser/ui/android...
chrome/browser/ui/android/context_menu_helper.cc:36: void
ContextMenuHelper::ShowContextMenu(
When the context menu is hidden, don't we need to clean up the params (and the
callback in the custom flow)?

https://codereview.chromium.org/73173002/diff/20001/chrome/browser/ui/android...
chrome/browser/ui/android/context_menu_helper.cc:87: for (i =
params.custom_items.begin(); i != params.custom_items.end(); i++) {
++i

https://codereview.chromium.org/73173002/diff/20001/chrome/browser/ui/android...
File chrome/browser/ui/android/context_menu_helper.h (right):

https://codereview.chromium.org/73173002/diff/20001/chrome/browser/ui/android...
chrome/browser/ui/android/context_menu_helper.h:43: const
content::ContextMenuParams& params);
indented too much

https://codereview.chromium.org/73173002/diff/20001/ui/android/java/src/org/c...
File ui/android/java/src/org/chromium/ui/Clipboard.java (right):

https://codereview.chromium.org/73173002/diff/20001/ui/android/java/src/org/c...
ui/android/java/src/org/chromium/ui/Clipboard.java:89:
mClipboardManager.setPrimaryClip(ClipData.newPlainText(label, text));
For all these setPrimaryClip calls, it's probably best to wrap them in a generic
Exception block to handle issues with the clipboard manager implementations on
various android versions.

Link to a discussion about it in the past:
http://developer.samsung.com/forum/board/thread/view.do?boardName=GeneralB&me...

If this happens, we should probably just show a toast with a generic exception
(we do it somewhere else but I can't recall off the top of my head).

[David Trainor- moved to gerrit, 2013-11-25 19:42:49]

Addressed comments.  Still need to add download tests/infrastructure but rest
should be good to go.

https://codereview.chromium.org/73173002/diff/20001/chrome/android/java/src/o...
File chrome/android/java/src/org/chromium/chrome/browser/TabBase.java (right):

https://codereview.chromium.org/73173002/diff/20001/chrome/android/java/src/o...
chrome/android/java/src/org/chromium/chrome/browser/TabBase.java:824: 
On 2013/11/19 02:44:03, Ted C wrote:
> there isn't any blank lines between the other native methods, so probably
> shouldn't have one here.

Done.

https://codereview.chromium.org/73173002/diff/20001/chrome/android/java/src/o...
File
chrome/android/java/src/org/chromium/chrome/browser/context_menu/ChromeContextMenuItemDelegate.java
(right):

https://codereview.chromium.org/73173002/diff/20001/chrome/android/java/src/o...
chrome/android/java/src/org/chromium/chrome/browser/context_menu/ChromeContextMenuItemDelegate.java:5:
package org.chromium.chrome.browser.context_menu;
On 2013/11/19 02:44:03, Ted C wrote:
> normally there aren't _'s in java package names.  Should probably just be
> contextmenu

Done.

https://codereview.chromium.org/73173002/diff/20001/chrome/android/java/src/o...
chrome/android/java/src/org/chromium/chrome/browser/context_menu/ChromeContextMenuItemDelegate.java:14:
public boolean isIncognito();
On 2013/11/19 02:44:03, Ted C wrote:
> public isn't needed in interface descriptions

Done.

https://codereview.chromium.org/73173002/diff/20001/chrome/android/java/src/o...
chrome/android/java/src/org/chromium/chrome/browser/context_menu/ChromeContextMenuItemDelegate.java:28:
* Called when {@code url} should be opened in a new tab with the same incognito
state as the
On 2013/11/19 02:44:03, Ted C wrote:
> when [the] {@code url}
> 
> ?? same other places

Done.

https://codereview.chromium.org/73173002/diff/20001/chrome/android/java/src/o...
chrome/android/java/src/org/chromium/chrome/browser/context_menu/ChromeContextMenuItemDelegate.java:29:
* current {@link ContentView}.
On 2013/11/19 02:44:03, Ted C wrote:
> TabBase ?

Done.

https://codereview.chromium.org/73173002/diff/20001/chrome/android/java/src/o...
File
chrome/android/java/src/org/chromium/chrome/browser/context_menu/ContextMenuHelper.java
(right):

https://codereview.chromium.org/73173002/diff/20001/chrome/android/java/src/o...
chrome/android/java/src/org/chromium/chrome/browser/context_menu/ContextMenuHelper.java:56:
* @param contentViewCore
On 2013/11/19 02:44:03, Ted C wrote:
> missing description

Done.

https://codereview.chromium.org/73173002/diff/20001/chrome/android/java/src/o...
File
chrome/android/java/src/org/chromium/chrome/browser/context_menu/ContextMenuParams.java
(right):

https://codereview.chromium.org/73173002/diff/20001/chrome/android/java/src/o...
chrome/android/java/src/org/chromium/chrome/browser/context_menu/ContextMenuParams.java:18:
@JNINamespace("AndroidContextMenuParams")
On 2013/11/19 02:44:03, Ted C wrote:
> I think Android typically goes at the end.

Done.

https://codereview.chromium.org/73173002/diff/20001/chrome/android/java/src/o...
chrome/android/java/src/org/chromium/chrome/browser/context_menu/ContextMenuParams.java:66:
return mCustomMenuItems.size() > 0;
On 2013/11/19 02:44:03, Ted C wrote:
> isEmpty()

Done.

https://codereview.chromium.org/73173002/diff/20001/chrome/browser/android/ta...
File chrome/browser/android/tab_android.h (right):

https://codereview.chromium.org/73173002/diff/20001/chrome/browser/android/ta...
chrome/browser/android/tab_android.h:138: // TODO: Move out?
On 2013/11/19 02:44:03, Ted C wrote:
> seems a bit lacking

Done.

https://codereview.chromium.org/73173002/diff/20001/chrome/browser/ui/android...
File chrome/browser/ui/android/context_menu_helper.cc (right):

https://codereview.chromium.org/73173002/diff/20001/chrome/browser/ui/android...
chrome/browser/ui/android/context_menu_helper.cc:36: void
ContextMenuHelper::ShowContextMenu(
We don't *really* need to as the callback is a weak reference and the params are
a copy.  It's not as clean but there's no easy way to tell when the context menu
is gone.  I can pipe a window focus event through the WindowAndroid class
(indeed we should be doing that) but if you're okay with it, I'll do that as a
follow up.

On 2013/11/19 02:44:03, Ted C wrote:
> When the context menu is hidden, don't we need to clean up the params (and the
> callback in the custom flow)?

https://codereview.chromium.org/73173002/diff/20001/chrome/browser/ui/android...
chrome/browser/ui/android/context_menu_helper.cc:87: for (i =
params.custom_items.begin(); i != params.custom_items.end(); i++) {
On 2013/11/19 02:44:03, Ted C wrote:
> ++i

Done.

https://codereview.chromium.org/73173002/diff/20001/chrome/browser/ui/android...
File chrome/browser/ui/android/context_menu_helper.h (right):

https://codereview.chromium.org/73173002/diff/20001/chrome/browser/ui/android...
chrome/browser/ui/android/context_menu_helper.h:43: const
content::ContextMenuParams& params);
On 2013/11/19 02:44:03, Ted C wrote:
> indented too much

Done.

https://codereview.chromium.org/73173002/diff/20001/ui/android/java/src/org/c...
File ui/android/java/src/org/chromium/ui/Clipboard.java (right):

https://codereview.chromium.org/73173002/diff/20001/ui/android/java/src/org/c...
ui/android/java/src/org/chromium/ui/Clipboard.java:89:
mClipboardManager.setPrimaryClip(ClipData.newPlainText(label, text));
On 2013/11/19 02:44:03, Ted C wrote:
> For all these setPrimaryClip calls, it's probably best to wrap them in a
generic
> Exception block to handle issues with the clipboard manager implementations on
> various android versions.
> 
> Link to a discussion about it in the past:
>
http://developer.samsung.com/forum/board/thread/view.do?boardName=GeneralB&me...
> 
> If this happens, we should probably just show a toast with a generic exception
> (we do it somewhere else but I can't recall off the top of my head).

Done.

[Ted C, 2013-11-26 01:50:08]

lgtm with a few final comments

https://codereview.chromium.org/73173002/diff/210001/chrome/android/java/src/...
File
chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
(right):

https://codereview.chromium.org/73173002/diff/210001/chrome/android/java/src/...
chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java:114:
}
else {
    assert false; ?
}

https://codereview.chromium.org/73173002/diff/210001/chrome/android/java/src/...
File
chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ContextMenuPopulatorWrapper.java
(right):

https://codereview.chromium.org/73173002/diff/210001/chrome/android/java/src/...
chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ContextMenuPopulatorWrapper.java:11:
*
missing javadoc

https://codereview.chromium.org/73173002/diff/210001/chrome/android/javatests...
File
chrome/android/javatests/src/org/chromium/chrome/browser/TabBaseTabUtils.java
(right):

https://codereview.chromium.org/73173002/diff/210001/chrome/android/javatests...
chrome/android/javatests/src/org/chromium/chrome/browser/TabBaseTabUtils.java:67:
System.out.println("weak reference: " + mContextMenu.get());
remove print out

https://codereview.chromium.org/73173002/diff/210001/ui/android/java/src/org/...
File ui/android/java/src/org/chromium/ui/base/Clipboard.java (right):

https://codereview.chromium.org/73173002/diff/210001/ui/android/java/src/org/...
ui/android/java/src/org/chromium/ui/base/Clipboard.java:157: } catch (Exception
ex) {
We should throw up some kind of toast saying copying to clipboard failed at the
system level, to avoid people wondering what happened.

[David Trainor- moved to gerrit, 2013-11-26 23:51:07]

https://chromiumcodereview.appspot.com/73173002/diff/210001/chrome/android/ja...
File
chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
(right):

https://chromiumcodereview.appspot.com/73173002/diff/210001/chrome/android/ja...
chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java:114:
}
On 2013/11/26 01:50:09, Ted C wrote:
> else {
>     assert false; ?
> }

Done.

https://chromiumcodereview.appspot.com/73173002/diff/210001/chrome/android/ja...
File
chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ContextMenuPopulatorWrapper.java
(right):

https://chromiumcodereview.appspot.com/73173002/diff/210001/chrome/android/ja...
chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ContextMenuPopulatorWrapper.java:11:
*
On 2013/11/26 01:50:09, Ted C wrote:
> missing javadoc

Done.

https://chromiumcodereview.appspot.com/73173002/diff/210001/chrome/android/ja...
File
chrome/android/javatests/src/org/chromium/chrome/browser/TabBaseTabUtils.java
(right):

https://chromiumcodereview.appspot.com/73173002/diff/210001/chrome/android/ja...
chrome/android/javatests/src/org/chromium/chrome/browser/TabBaseTabUtils.java:67:
System.out.println("weak reference: " + mContextMenu.get());
On 2013/11/26 01:50:09, Ted C wrote:
> remove print out

Done.

https://chromiumcodereview.appspot.com/73173002/diff/210001/ui/android/java/s...
File ui/android/java/src/org/chromium/ui/base/Clipboard.java (right):

https://chromiumcodereview.appspot.com/73173002/diff/210001/ui/android/java/s...
ui/android/java/src/org/chromium/ui/base/Clipboard.java:157: } catch (Exception
ex) {
On 2013/11/26 01:50:09, Ted C wrote:
> We should throw up some kind of toast saying copying to clipboard failed at
the
> system level, to avoid people wondering what happened.

Done.

[David Trainor- moved to gerrit, 2013-12-03 01:32:12]

ptal:

boliu@: Can you do an OWNERS review for
ui/android/java/resource_map/org/chromium/ui/R.java?

isherman@: Can you do an OWNERS review for tools/metrics/actions/*?

Thanks!

[Ilya Sherman, 2013-12-03 03:48:11]

//tools/metrics/actions lgtm

[boliu, 2013-12-03 09:08:19]

On 2013/12/03 01:32:12, David Trainor wrote:
> ptal:
> 
> boliu@: Can you do an OWNERS review for
> ui/android/java/resource_map/org/chromium/ui/R.java?

lgtm

> 
> isherman@: Can you do an OWNERS review for tools/metrics/actions/*?
> 
> Thanks!

[commit-bot: I haz the power, 2013-12-04 18:50:20]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/dtrainor@chromium.org/73173002/400001

[commit-bot: I haz the power, 2013-12-04 18:50:48]

Failed to apply patch for
ui/android/java/src/org/chromium/ui/base/Clipboard.java:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file ui/android/java/src/org/chromium/ui/base/Clipboard.java
  Hunk #1 succeeded at 7 with fuzz 1 (offset 1 line).
  Hunk #2 succeeded at 33 (offset 1 line).
  Hunk #3 succeeded at 102 (offset 18 lines).
  Hunk #4 FAILED at 128.
  Hunk #5 succeeded at 157 with fuzz 2 (offset 3 lines).
  1 out of 5 hunks FAILED -- saving rejects to file
ui/android/java/src/org/chromium/ui/base/Clipboard.java.rej

Patch:       ui/android/java/src/org/chromium/ui/base/Clipboard.java
Index: ui/android/java/src/org/chromium/ui/base/Clipboard.java
diff --git a/ui/android/java/src/org/chromium/ui/base/Clipboard.java
b/ui/android/java/src/org/chromium/ui/base/Clipboard.java
index
e62c84ab84134c46b304d537d96300d8e0f234d8..a5bd6a3bd713f6bdaf79c2d71796d47b5f8cee89
100644
--- a/ui/android/java/src/org/chromium/ui/base/Clipboard.java
+++ b/ui/android/java/src/org/chromium/ui/base/Clipboard.java
@@ -6,12 +6,14 @@ package org.chromium.ui.base;
 
 import org.chromium.base.CalledByNative;
 import org.chromium.base.JNINamespace;
+import org.chromium.ui.R;
 
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
 import android.os.Build;
 import android.text.TextUtils;
+import android.widget.Toast;
 
 /**
  * Simple proxy that provides C++ code with an access pathway to the Android
@@ -30,7 +32,7 @@ public class Clipboard {
      *
      * @param context for accessing the clipboard
      */
-    private Clipboard(final Context context) {
+    public Clipboard(final Context context) {
         mContext = context;
         mClipboardManager = (ClipboardManager)
                 context.getSystemService(Context.CLIPBOARD_SERVICE);
@@ -82,12 +84,39 @@ public class Clipboard {
      * clipboard's current primary clip to a plain-text clip that consists of
      * the specified string.
      *
+     * @param label will become the label of the clipboard's primary clip
+     * @param text  will become the content of the clipboard's primary clip
+     */
+    public void setText(final String label, final String text) {
+        setPrimaryClipNoException(ClipData.newPlainText(label, text));
+    }
+
+    /**
+     * Emulates the behavior of the now-deprecated
+     * {@link android.text.ClipboardManager#setText(CharSequence)}, setting the
+     * clipboard's current primary clip to a plain-text clip that consists of
+     * the specified string.
+     *
      * @param text will become the content of the clipboard's primary clip
      */
-    @SuppressWarnings("javadoc")
     @CalledByNative
-    private void setText(final String text) {
-        mClipboardManager.setPrimaryClip(ClipData.newPlainText(null, text));
+    public void setText(final String text) {
+        setText(null, text);
+    }
+
+    /**
+     * Writes HTML to the clipboard, together with a plain-text representation
+     * of that very data. This API is only available in Android JellyBean+ and
+     * will be a no-operation in older versions.
+     *
+     * @param html  The HTML content to be pasted to the clipboard.
+     * @param label The Plain-text label for the HTML content.
+     * @param text  Plain-text representation of the HTML content.
+     */
+    public void setHTMLText(final String html, final String label, final String
text) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
+            setPrimaryClipNoException(ClipData.newHtmlText(label, text, html));
+        }
     }
 
     /**
@@ -99,11 +128,8 @@ public class Clipboard {
      * @param text Plain-text representation of the HTML content.
      */
     @CalledByNative
-    private void setHTMLText(final String html, final String text) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
-            mClipboardManager.setPrimaryClip(
-                    ClipData.newHtmlText(null, text, html));
-        }
+    public void setHTMLText(final String html, final String text) {
+        setHTMLText(html, null, text);
     }
 
     /**
@@ -125,4 +151,14 @@ public class Clipboard {
         }
         return false;
     }
+
+    private void setPrimaryClipNoException(ClipData clip) {
+        try {
+            mClipboardManager.setPrimaryClip(clip);
+        } catch (Exception ex) {
+            // Ignore any exceptions here as certain devices have bugs and will
fail.
+            String text =
mContext.getString(R.string.copy_to_clipboard_failure_message);
+            Toast.makeText(mContext, text, Toast.LENGTH_SHORT).show();
+        }
+    }
 }

[commit-bot: I haz the power, 2013-12-04 21:05:38]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/dtrainor@chromium.org/73173002/420001

[commit-bot: I haz the power, 2013-12-04 21:05:53]

Failed to apply patch for
ui/android/java/src/org/chromium/ui/base/Clipboard.java:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file ui/android/java/src/org/chromium/ui/base/Clipboard.java
  Hunk #1 succeeded at 7 with fuzz 1 (offset 1 line).
  Hunk #2 succeeded at 33 (offset 1 line).
  Hunk #3 succeeded at 102 (offset 18 lines).
  Hunk #4 FAILED at 128.
  Hunk #5 succeeded at 157 with fuzz 2 (offset 3 lines).
  1 out of 5 hunks FAILED -- saving rejects to file
ui/android/java/src/org/chromium/ui/base/Clipboard.java.rej

Patch:       ui/android/java/src/org/chromium/ui/base/Clipboard.java
Index: ui/android/java/src/org/chromium/ui/base/Clipboard.java
diff --git a/ui/android/java/src/org/chromium/ui/base/Clipboard.java
b/ui/android/java/src/org/chromium/ui/base/Clipboard.java
index
e62c84ab84134c46b304d537d96300d8e0f234d8..a5bd6a3bd713f6bdaf79c2d71796d47b5f8cee89
100644
--- a/ui/android/java/src/org/chromium/ui/base/Clipboard.java
+++ b/ui/android/java/src/org/chromium/ui/base/Clipboard.java
@@ -6,12 +6,14 @@ package org.chromium.ui.base;
 
 import org.chromium.base.CalledByNative;
 import org.chromium.base.JNINamespace;
+import org.chromium.ui.R;
 
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
 import android.os.Build;
 import android.text.TextUtils;
+import android.widget.Toast;
 
 /**
  * Simple proxy that provides C++ code with an access pathway to the Android
@@ -30,7 +32,7 @@ public class Clipboard {
      *
      * @param context for accessing the clipboard
      */
-    private Clipboard(final Context context) {
+    public Clipboard(final Context context) {
         mContext = context;
         mClipboardManager = (ClipboardManager)
                 context.getSystemService(Context.CLIPBOARD_SERVICE);
@@ -82,12 +84,39 @@ public class Clipboard {
      * clipboard's current primary clip to a plain-text clip that consists of
      * the specified string.
      *
+     * @param label will become the label of the clipboard's primary clip
+     * @param text  will become the content of the clipboard's primary clip
+     */
+    public void setText(final String label, final String text) {
+        setPrimaryClipNoException(ClipData.newPlainText(label, text));
+    }
+
+    /**
+     * Emulates the behavior of the now-deprecated
+     * {@link android.text.ClipboardManager#setText(CharSequence)}, setting the
+     * clipboard's current primary clip to a plain-text clip that consists of
+     * the specified string.
+     *
      * @param text will become the content of the clipboard's primary clip
      */
-    @SuppressWarnings("javadoc")
     @CalledByNative
-    private void setText(final String text) {
-        mClipboardManager.setPrimaryClip(ClipData.newPlainText(null, text));
+    public void setText(final String text) {
+        setText(null, text);
+    }
+
+    /**
+     * Writes HTML to the clipboard, together with a plain-text representation
+     * of that very data. This API is only available in Android JellyBean+ and
+     * will be a no-operation in older versions.
+     *
+     * @param html  The HTML content to be pasted to the clipboard.
+     * @param label The Plain-text label for the HTML content.
+     * @param text  Plain-text representation of the HTML content.
+     */
+    public void setHTMLText(final String html, final String label, final String
text) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
+            setPrimaryClipNoException(ClipData.newHtmlText(label, text, html));
+        }
     }
 
     /**
@@ -99,11 +128,8 @@ public class Clipboard {
      * @param text Plain-text representation of the HTML content.
      */
     @CalledByNative
-    private void setHTMLText(final String html, final String text) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
-            mClipboardManager.setPrimaryClip(
-                    ClipData.newHtmlText(null, text, html));
-        }
+    public void setHTMLText(final String html, final String text) {
+        setHTMLText(html, null, text);
     }
 
     /**
@@ -125,4 +151,14 @@ public class Clipboard {
         }
         return false;
     }
+
+    private void setPrimaryClipNoException(ClipData clip) {
+        try {
+            mClipboardManager.setPrimaryClip(clip);
+        } catch (Exception ex) {
+            // Ignore any exceptions here as certain devices have bugs and will
fail.
+            String text =
mContext.getString(R.string.copy_to_clipboard_failure_message);
+            Toast.makeText(mContext, text, Toast.LENGTH_SHORT).show();
+        }
+    }
 }

[commit-bot: I haz the power, 2013-12-05 18:39:10]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/dtrainor@chromium.org/73173002/440001

[commit-bot: I haz the power, 2013-12-05 19:01:04]

Retried try job too often on chromium_presubmit for step(s) presubmit
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=chromium_p...

[David Trainor- moved to gerrit, 2013-12-05 19:06:45]

owners resource_map ptal!

[michaelbai, 2013-12-05 19:32:07]

LGTM on behavior of Bo, I didn't check the patch, since Bo already LGTM

[commit-bot: I haz the power, 2013-12-05 19:41:17]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/dtrainor@chromium.org/73173002/440001

[commit-bot: I haz the power, 2013-12-06 00:02:39]

Change committed as 239076