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

Unified Diff: ui/base/clipboard/clipboard.h

Issue 10695051: Upstream the Android clipboard implementation (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 6 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 | « build/android/gtest_filter/ui_unittests_disabled ('k') | ui/base/clipboard/clipboard_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/clipboard/clipboard.h
diff --git a/ui/base/clipboard/clipboard.h b/ui/base/clipboard/clipboard.h
index dffb146a972f1809c30c43126926c13a25049143..ab5701a6f747db483c616df84822a26b11b88465 100644
--- a/ui/base/clipboard/clipboard.h
+++ b/ui/base/clipboard/clipboard.h
@@ -356,30 +356,6 @@ class UI_EXPORT Clipboard : NON_EXPORTED_BASE(public base::ThreadChecker) {
TargetMap* clipboard_data_;
GtkClipboard* clipboard_;
GtkClipboard* primary_selection_;
-#elif defined(OS_ANDROID)
- // Returns whether some text is available from the Android Clipboard.
- bool IsTextAvailableFromAndroid() const;
-
- // Make sure that the Android Clipboard contents matches what we think it
- // should contain. If it changed, a copy occured from another application and
- // all internal data is dropped.
- void ValidateInternalClipboard() const;
-
- // Clear the Clipboard for all types. Both for Android and internal.
- void Clear();
-
- // Clear the internal clipboard.
- void ClearInternalClipboard() const;
-
- // This private method is used to set non text key/value.
- void Set(const std::string& key, const std::string& value);
-
- // Java class and methods for the Android ClipboardManager.
- base::android::ScopedJavaGlobalRef<jobject> clipboard_manager_;
- jmethodID set_text_;
- jmethodID has_text_;
- jmethodID get_text_;
- jmethodID to_string_;
#endif
DISALLOW_COPY_AND_ASSIGN(Clipboard);
« no previous file with comments | « build/android/gtest_filter/ui_unittests_disabled ('k') | ui/base/clipboard/clipboard_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698