Revert 183123

ui/base/clipboard/clipboard_chromeos.cc

Index: ui/base/clipboard/clipboard_chromeos.cc
===================================================================
--- ui/base/clipboard/clipboard_chromeos.cc	(revision 183210)
+++ ui/base/clipboard/clipboard_chromeos.cc	(working copy)
@@ -34,7 +34,6 @@
   BITMAP    = 1 << 4,
   CUSTOM    = 1 << 5,
   WEB       = 1 << 6,
-  SOURCETAG = 1 << 7,
 };
 
 // ClipboardData contains data copied to the Clipboard for a variety of formats.
@@ -43,7 +42,6 @@
  public:
   ClipboardData()
       : bitmap_data_(),
-        source_tag_(),
         web_smart_paste_(false),
         format_(0) {}
 
@@ -120,12 +118,6 @@
     format_ |= WEB;
   }
 
-  Clipboard::SourceTag source_tag() const { return source_tag_; }
-  void set_source_tag(Clipboard::SourceTag tag) {
-    source_tag_ = tag;
-    format_ |= SOURCETAG;
-  }
-
  private:
   // Plain text in UTF8 format.
   std::string text_;
@@ -152,9 +144,6 @@
   std::string custom_data_format_;
   std::string custom_data_data_;
 
-  // SourceTag.
-  Clipboard::SourceTag source_tag_;
-
   // WebKit smart paste data.
   bool web_smart_paste_;
 
@@ -307,13 +296,6 @@
     *result = data->custom_data_data();
   }
 
-  Clipboard::SourceTag ReadSourceTag() const {
-    if (!HasFormat(SOURCETAG))
-      return Clipboard::SourceTag();
-    const ClipboardData* data = GetData();
-    return data->source_tag();
-  }
-
   // Writes |data| to the top of the clipboard stack.
   void WriteData(ClipboardData* data) {
     DCHECK(data);
@@ -417,11 +399,6 @@
     data->SetCustomData(format, std::string(data_data, data_len));
   }
 
-  static void WriteSourceTag(Clipboard::SourceTag tag) {
-    ClipboardData* data = GetCurrentData();
-    data->set_source_tag(tag);
-  }
-
  private:
   static ClipboardData* GetCurrentData() {
     if (!current_data_)
@@ -471,16 +448,13 @@
   DeleteClipboard();
 }
 
-void Clipboard::WriteObjectsImpl(Buffer buffer,
-                                 const ObjectMap& objects,
-                                 SourceTag tag) {
+void Clipboard::WriteObjects(Buffer buffer, const ObjectMap& objects) {
   DCHECK(CalledOnValidThread());
   DCHECK(IsValidBuffer(buffer));
   for (ObjectMap::const_iterator iter = objects.begin();
        iter != objects.end(); ++iter) {
     DispatchObject(static_cast<ObjectType>(iter->first), iter->second);
   }
-  WriteSourceTag(tag);
   ClipboardDataBuilder::CommitToClipboard();
 }
 
@@ -587,12 +561,6 @@
   GetClipboard()->ReadData(format.ToString(), result);
 }
 
-Clipboard::SourceTag Clipboard::ReadSourceTag(Buffer buffer) const {
-  DCHECK(CalledOnValidThread());
-  DCHECK_EQ(BUFFER_STANDARD, buffer);
-  return GetClipboard()->ReadSourceTag();
-}
-
 uint64 Clipboard::GetSequenceNumber(Buffer buffer) {
   DCHECK(CalledOnValidThread());
   return GetClipboard()->GetNumClipboardEntries();
@@ -634,11 +602,6 @@
   ClipboardDataBuilder::WriteData(format.ToString(), data_data, data_len);
 }
 
-void Clipboard::WriteSourceTag(SourceTag tag) {
-  if (tag != SourceTag())
-    ClipboardDataBuilder::WriteSourceTag(tag);
-}
-
 // static
 Clipboard::FormatType Clipboard::GetFormatType(
     const std::string& format_string) {