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

Unified Diff: ui/base/clipboard/clipboard_android.cc

Issue 25668005: Android should be able to copy HTML snippets to the system clipboard. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 2 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 | « ui/android/java/src/org/chromium/ui/Clipboard.java ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/clipboard/clipboard_android.cc
diff --git a/ui/base/clipboard/clipboard_android.cc b/ui/base/clipboard/clipboard_android.cc
index 4eb052acf7a3a45f112052b4e96978f0001b542b..4c23984d30a5c8ce9e810fe0cb5f5bec56f5465b 100644
--- a/ui/base/clipboard/clipboard_android.cc
+++ b/ui/base/clipboard/clipboard_android.cc
@@ -101,6 +101,21 @@ void ClipboardMap::Set(const std::string& format, const std::string& data) {
env, data.c_str());
DCHECK(str.obj() && !ClearException(env));
Java_Clipboard_setText(env, clipboard_manager_.obj(), str.obj());
+ } else if (format == kHTMLFormat) {
+ // Android's API for storing HTML content on the clipboard requires a plain-
+ // text representation to be available as well. Because of an std::map's
+ // keys being ordered, any plain-text representation will be set already.
+ if (!ContainsKey(map_, kPlainTextFormat))
+ return;
+
+ ScopedJavaLocalRef<jstring> html = ConvertUTF8ToJavaString(
+ env, data.c_str());
+ ScopedJavaLocalRef<jstring> text = ConvertUTF8ToJavaString(
+ env, map_[kPlainTextFormat].c_str());
+
+ DCHECK(html.obj() && text.obj() && !ClearException(env));
+ Java_Clipboard_setHTMLText(
+ env, clipboard_manager_.obj(), html.obj(), text.obj());
dcheng 2013/10/02 22:24:15 What is the expected behavior if a JS paste handle
Peter Beverloo 2013/10/23 17:11:34 That's a good question. Pasting HTML on Android r
}
}
« no previous file with comments | « ui/android/java/src/org/chromium/ui/Clipboard.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698