Revert of Implement ui::ClipboardMus.

ui/base/dragdrop/os_exchange_data_provider_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/dragdrop/os_exchange_data_provider_aurax11.h"
 
 #include "base/logging.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
@@ skipping 13 matching lines @@
 
 namespace ui {
 
 namespace {
 
 const char kDndSelection[] = "XdndSelection";
 const char kRendererTaint[] = "chromium/x-renderer-taint";
 
 const char kNetscapeURL[] = "_NETSCAPE_URL";
 
-const char* kAtomsToCache[] = {kString,
-                               kText,
-                               kUtf8String,
-                               kDndSelection,
-                               Clipboard::kMimeTypeURIList,
-                               Clipboard::kMimeTypeMozillaURL,
-                               kNetscapeURL,
-                               Clipboard::kMimeTypeText,
-                               kRendererTaint,
-                               nullptr};
+const char* kAtomsToCache[] = {
+  kString,
+  kText,
+  kUtf8String,
+  kDndSelection,
+  Clipboard::kMimeTypeURIList,
+  kMimeTypeMozillaURL,
+  kNetscapeURL,
+  Clipboard::kMimeTypeText,
+  kRendererTaint,
+  NULL
+};
 
 }  // namespace
 
 OSExchangeDataProviderAuraX11::OSExchangeDataProviderAuraX11(
     ::Window x_window,
     const SelectionFormatMap& selection)
     : x_display_(gfx::GetXDisplay()),
       x_root_window_(DefaultRootWindow(x_display_)),
       own_window_(false),
       x_window_(x_window),
@@ skipping 93 matching lines @@
     // Mozilla's URL format: (UTF16: URL, newline, title)
     base::string16 spec = base::UTF8ToUTF16(url.spec());
 
     std::vector<unsigned char> data;
     ui::AddString16ToVector(spec, &data);
     ui::AddString16ToVector(base::ASCIIToUTF16("\n"), &data);
     ui::AddString16ToVector(title, &data);
     scoped_refptr<base::RefCountedMemory> mem(
         base::RefCountedBytes::TakeVector(&data));
 
-    format_map_.Insert(atom_cache_.GetAtom(Clipboard::kMimeTypeMozillaURL),
-                       mem);
+    format_map_.Insert(atom_cache_.GetAtom(kMimeTypeMozillaURL), mem);
 
     // Set a string fallback as well.
     SetString(spec);
 
     // Return early if this drag already contains file contents (this implies
     // that file contents must be populated before URLs). Nautilus (and possibly
     // other file managers) prefer _NETSCAPE_URL over the X Direct Save
     // protocol, but we want to prioritize XDS in this case.
     if (!file_contents_name_.empty())
       return;
@@ skipping 78 matching lines @@
   std::vector< ::Atom> url_atoms = ui::GetURLAtomsFrom(&atom_cache_);
   std::vector< ::Atom> requested_types;
   ui::GetAtomIntersection(url_atoms, GetTargets(), &requested_types);
 
   ui::SelectionData data(format_map_.GetFirstOf(requested_types));
   if (data.IsValid()) {
     // TODO(erg): Technically, both of these forms can accept multiple URLs,
     // but that doesn't match the assumptions of the rest of the system which
     // expect single types.
 
-    if (data.GetType() == atom_cache_.GetAtom(Clipboard::kMimeTypeMozillaURL)) {
+    if (data.GetType() == atom_cache_.GetAtom(kMimeTypeMozillaURL)) {
       // Mozilla URLs are (UTF16: URL, newline, title).
       base::string16 unparsed;
       data.AssignTo(&unparsed);
 
       std::vector<base::string16> tokens = base::SplitString(
           unparsed, base::ASCIIToUTF16("\n"),
           base::KEEP_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
       if (tokens.size() > 0) {
         if (tokens.size() > 1)
           *title = tokens[1];
@@ skipping 86 matching lines @@
   std::vector< ::Atom> requested_types;
   ui::GetAtomIntersection(url_atoms, GetTargets(), &requested_types);
 
   if (requested_types.empty())
     return false;
 
   // The Linux desktop doesn't differentiate between files and URLs like
   // Windows does and stuffs all the data into one mime type.
   ui::SelectionData data(format_map_.GetFirstOf(requested_types));
   if (data.IsValid()) {
-    if (data.GetType() == atom_cache_.GetAtom(Clipboard::kMimeTypeMozillaURL)) {
+    if (data.GetType() == atom_cache_.GetAtom(kMimeTypeMozillaURL)) {
       // File managers shouldn't be using this type, so this is a URL.
       return true;
     } else if (data.GetType() == atom_cache_.GetAtom(
         ui::Clipboard::kMimeTypeURIList)) {
       std::vector<std::string> tokens = ui::ParseURIList(data);
       for (std::vector<std::string>::const_iterator it = tokens.begin();
            it != tokens.end(); ++it) {
         if (!GURL(*it).SchemeIsFile() ||
             policy == OSExchangeData::CONVERT_FILENAMES)
           return true;
@@ skipping 40 matching lines @@
   ui::GetAtomIntersection(url_atoms, GetTargets(), &requested_types);
 
   return !requested_types.empty();
 }
 
 void OSExchangeDataProviderAuraX11::SetFileContents(
     const base::FilePath& filename,
     const std::string& file_contents) {
   DCHECK(!filename.empty());
   DCHECK(format_map_.end() ==
-         format_map_.find(atom_cache_.GetAtom(Clipboard::kMimeTypeMozillaURL)));
+         format_map_.find(atom_cache_.GetAtom(kMimeTypeMozillaURL)));
 
   file_contents_name_ = filename;
 
   // Direct save handling is a complicated juggling affair between this class,
   // SelectionFormat, and DesktopDragDropClientAuraX11. The general idea behind
   // the protocol is this:
   // - The source window sets its XdndDirectSave0 window property to the
   //   proposed filename.
   // - When a target window receives the drop, it updates the XdndDirectSave0
   //   property on the source window to the filename it would like the contents
@@ skipping 109 matching lines @@
 
 ///////////////////////////////////////////////////////////////////////////////
 // OSExchangeData, public:
 
 // static
 OSExchangeData::Provider* OSExchangeData::CreateProvider() {
   return new OSExchangeDataProviderAuraX11();
 }
 
 }  // namespace ui