| 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
|
|
|