Revert 183123

ui/base/clipboard/clipboard_aurax11.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/base/clipboard/clipboard.h"
 
 #include <X11/extensions/Xfixes.h>
 #include <X11/Xatom.h>
 #include <list>
 #include <set>
@@ skipping 21 matching lines @@
 namespace {
 
 const char kChromeSelection[] = "CHROME_SELECTION";
 const char kClipboard[] = "CLIPBOARD";
 const char kMimeTypeBitmap[] = "image/bmp";
 const char kMimeTypeFilename[] = "chromium/filename";
 const char kMimeTypeMozillaURL[] = "text/x-moz-url";
 const char kMimeTypePepperCustomData[] = "chromium/x-pepper-custom-data";
 const char kMimeTypeWebkitSmartPaste[] = "chromium/x-webkit-paste";
 const char kMultiple[] = "MULTIPLE";
-const char kSourceTagType[] = "org.chromium.source-tag";
 const char kString[] = "STRING";
 const char kTargets[] = "TARGETS";
 const char kText[] = "TEXT";
 const char kUtf8String[] = "UTF8_STRING";
 
 const char* kAtomsToCache[] = {
   kChromeSelection,
   kClipboard,
   kMimeTypeBitmap,
   kMimeTypeFilename,
   kMimeTypeMozillaURL,
   kMimeTypeWebkitSmartPaste,
   kMultiple,
-  kSourceTagType,
   kString,
   kTargets,
   kText,
   kUtf8String,
   NULL
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 // Returns a list of all text atoms that we handle.
@@ skipping 813 matching lines @@
 }
 
 Clipboard::~Clipboard() {
   DCHECK(CalledOnValidThread());
 
   // TODO(erg): We need to do whatever the equivalent of
   // gtk_clipboard_store(clipboard_) is here. When we shut down, we want the
   // current selection to live on.
 }
 
-void Clipboard::WriteObjectsImpl(Buffer buffer,
-                                 const ObjectMap& objects,
-                                 SourceTag tag) {
+void Clipboard::WriteObjects(Buffer buffer, const ObjectMap& objects) {
   DCHECK(CalledOnValidThread());
   DCHECK(IsValidBuffer(buffer));
 
   aurax11_details_->CreateNewClipboardData();
   for (ObjectMap::const_iterator iter = objects.begin();
        iter != objects.end(); ++iter) {
     DispatchObject(static_cast<ObjectType>(iter->first), iter->second);
   }
-  WriteSourceTag(tag);
   aurax11_details_->TakeOwnershipOfSelection(buffer);
 
   if (buffer == BUFFER_STANDARD) {
     ObjectMap::const_iterator text_iter = objects.find(CBF_TEXT);
     if (text_iter != objects.end()) {
       aurax11_details_->CreateNewClipboardData();
       const ObjectMapParam& char_vector = text_iter->second[0];
       WriteText(&char_vector.front(), char_vector.size());
-      WriteSourceTag(tag);
       aurax11_details_->TakeOwnershipOfSelection(BUFFER_SELECTION);
     }
   }
 }
 
 bool Clipboard::IsFormatAvailable(const FormatType& format,
                                   Buffer buffer) const {
   DCHECK(CalledOnValidThread());
   DCHECK(IsValidBuffer(buffer));
 
@@ skipping 126 matching lines @@
   ReadCustomDataForType(data->data(), data->size(), type, result);
 }
 
 void Clipboard::ReadBookmark(string16* title, std::string* url) const {
   DCHECK(CalledOnValidThread());
   // TODO(erg): This was left NOTIMPLEMENTED() in the gtk port too.
   NOTIMPLEMENTED();
 }
 
 void Clipboard::ReadData(const FormatType& format, std::string* result) const {
-  ReadDataImpl(BUFFER_STANDARD, format, result);
-}
-
-void Clipboard::ReadDataImpl(Buffer buffer,
-                             const FormatType& format,
-                             std::string* result) const {
   DCHECK(CalledOnValidThread());
 
   scoped_ptr<SelectionData> data(aurax11_details_->RequestAndWaitForTypes(
-      buffer, aurax11_details_->GetAtomsForFormat(format)));
+      BUFFER_STANDARD, aurax11_details_->GetAtomsForFormat(format)));
   if (data.get())
     data->AssignTo(result);
 }
 
-Clipboard::SourceTag Clipboard::ReadSourceTag(Buffer buffer) const {
-  std::string result;
-  ReadDataImpl(buffer, GetSourceTagFormatType(), &result);
-  return Binary2SourceTag(result);
-}
-
 uint64 Clipboard::GetSequenceNumber(Buffer buffer) {
   DCHECK(CalledOnValidThread());
   if (buffer == BUFFER_STANDARD)
     return SelectionChangeObserver::GetInstance()->clipboard_sequence_number();
   else
     return SelectionChangeObserver::GetInstance()->primary_sequence_number();
 }
 
 void Clipboard::WriteText(const char* text_data, size_t text_len) {
   char* data = new char[text_len];
@@ skipping 61 matching lines @@
                           size_t data_len) {
   // We assume that certain mapping types are only written by trusted code.
   // Therefore we must upkeep their integrity.
   if (format.Equals(GetBitmapFormatType()))
     return;
   char* data = new char[data_len];
   memcpy(data, data_data, data_len);
   aurax11_details_->InsertMapping(format.ToString(), data, data_len);
 }
 
-void Clipboard::WriteSourceTag(SourceTag tag) {
-  if (tag != SourceTag()) {
-    ObjectMapParam binary = SourceTag2Binary(tag);
-    WriteData(GetSourceTagFormatType(), &binary[0], binary.size());
-  }
-}
-
 // static
 Clipboard::FormatType Clipboard::GetFormatType(
     const std::string& format_string) {
   return FormatType::Deserialize(format_string);
 }
 
 // static
 const Clipboard::FormatType& Clipboard::GetUrlFormatType() {
   CR_DEFINE_STATIC_LOCAL(FormatType, type, (kMimeTypeURIList));
   return type;
@@ skipping 55 matching lines @@
   CR_DEFINE_STATIC_LOCAL(FormatType, type, (kMimeTypeWebCustomData));
   return type;
 }
 
 // static
 const Clipboard::FormatType& Clipboard::GetPepperCustomDataFormatType() {
   CR_DEFINE_STATIC_LOCAL(FormatType, type, (kMimeTypePepperCustomData));
   return type;
 }
 
-// static
-const Clipboard::FormatType& Clipboard::GetSourceTagFormatType() {
-  CR_DEFINE_STATIC_LOCAL(FormatType, type, (kSourceTagType));
-  return type;
-}
-
 }  // namespace ui