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

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

Issue 720373003: Add FakeClipboard implementation for unit tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: WINDOWS!!! Created 6 years, 1 month 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/base/clipboard/clipboard_android.h ('k') | ui/base/clipboard/clipboard_android_unittest.cc » ('j') | 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 8b25b7cc01448124b71c2fff1824d1e4e3f9d65f..c197d854b3cdecdf73cf29893ccccb1247b34e71 100644
--- a/ui/base/clipboard/clipboard_android.cc
+++ b/ui/base/clipboard/clipboard_android.cc
@@ -35,6 +35,7 @@ namespace ui {
namespace {
// Various formats we support.
+const char kURLFormat[] = "url";
const char kPlainTextFormat[] = "text";
const char kHTMLFormat[] = "html";
const char kRTFFormat[] = "rtf";
@@ -198,6 +199,10 @@ Clipboard::FormatType Clipboard::FormatType::Deserialize(
return FormatType(serialization);
}
+bool Clipboard::FormatType::operator<(const FormatType& other) const {
+ return data_ < other.data_;
+}
+
bool Clipboard::FormatType::Equals(const FormatType& other) const {
return data_ == other.data_;
}
@@ -210,6 +215,12 @@ Clipboard::FormatType Clipboard::GetFormatType(
}
// static
+const Clipboard::FormatType& Clipboard::GetUrlWFormatType() {
+ CR_DEFINE_STATIC_LOCAL(FormatType, type, (kURLFormat));
+ return type;
+}
+
+// static
const Clipboard::FormatType& Clipboard::GetPlainTextFormatType() {
CR_DEFINE_STATIC_LOCAL(FormatType, type, (kPlainTextFormat));
return type;
@@ -272,7 +283,7 @@ ClipboardAndroid::~ClipboardAndroid() {
DCHECK(CalledOnValidThread());
}
-uint64 ClipboardAndroid::GetSequenceNumber(ClipboardType /* type */) {
+uint64 ClipboardAndroid::GetSequenceNumber(ClipboardType /* type */) const {
DCHECK(CalledOnValidThread());
// TODO: implement this. For now this interface will advertise
// that the clipboard never changes. That's fine as long as we
« no previous file with comments | « ui/base/clipboard/clipboard_android.h ('k') | ui/base/clipboard/clipboard_android_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698