Move XID, XDisplay, GetXDisplay and a few other types to ui/gfx/x/x11_types.h

ui/base/x/selection_utils.cc

 // Copyright (c) 2013 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/x/selection_utils.h"
 
 #include <set>
 
 #include "base/i18n/icu_string_conversions.h"
 #include "base/logging.h"
@@ skipping 115 matching lines @@
   for (const_iterator it = data_.begin(); it != data_.end(); ++it)
     atoms.push_back(it->first);
 
   return atoms;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 SelectionData::SelectionData()
     : type_(None),
-      atom_cache_(ui::GetXDisplay(), kSelectionDataAtoms) {
+      atom_cache_(gfx::GetXDisplay(), kSelectionDataAtoms) {
 }
 
 SelectionData::SelectionData(
     ::Atom type,
     const scoped_refptr<base::RefCountedMemory>& memory)
     : type_(type),
       memory_(memory),
-      atom_cache_(ui::GetXDisplay(), kSelectionDataAtoms) {
+      atom_cache_(gfx::GetXDisplay(), kSelectionDataAtoms) {
 }
 
 SelectionData::SelectionData(const SelectionData& rhs)
     : type_(rhs.type_),
       memory_(rhs.memory_),
-      atom_cache_(ui::GetXDisplay(), kSelectionDataAtoms) {
+      atom_cache_(gfx::GetXDisplay(), kSelectionDataAtoms) {
 }
 
 SelectionData::~SelectionData() {}
 
 SelectionData& SelectionData::operator=(const SelectionData& rhs) {
   type_ = rhs.type_;
   memory_ = rhs.memory_;
   // TODO(erg): In some future where we have to support multiple X Displays,
   // the following will also need to deal with the display.
   return *this;
@@ skipping 63 matching lines @@
 
 void SelectionData::AssignTo(std::string* result) const {
   *result = RefCountedMemoryToString(memory_);
 }
 
 void SelectionData::AssignTo(string16* result) const {
   *result = RefCountedMemoryToString16(memory_);
 }
 
 }  // namespace ui