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

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 72 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(SelectionChangeObserver);
 };
 
 SelectionChangeObserver::SelectionChangeObserver()
     : event_base_(-1),
       clipboard_atom_(None),
       clipboard_sequence_number_(0),
       primary_sequence_number_(0) {
   int ignored;
-  if (XFixesQueryExtension(GetXDisplay(), &event_base_, &ignored)) {
-    clipboard_atom_ = XInternAtom(GetXDisplay(), kClipboard, false);
-    XFixesSelectSelectionInput(GetXDisplay(), GetX11RootWindow(),
+  if (XFixesQueryExtension(gfx::GetXDisplay(), &event_base_, &ignored)) {
+    clipboard_atom_ = XInternAtom(gfx::GetXDisplay(), kClipboard, false);
+    XFixesSelectSelectionInput(gfx::GetXDisplay(), GetX11RootWindow(),
                                clipboard_atom_,
                                XFixesSetSelectionOwnerNotifyMask |
                                XFixesSelectionWindowDestroyNotifyMask |
                                XFixesSelectionClientCloseNotifyMask);
     // This seems to be semi-optional. For some reason, registering for any
     // selection notify events seems to subscribe us to events for both the
     // primary and the clipboard buffers. Register anyway just to be safe.
-    XFixesSelectSelectionInput(GetXDisplay(), GetX11RootWindow(),
+    XFixesSelectSelectionInput(gfx::GetXDisplay(), GetX11RootWindow(),
                                XA_PRIMARY,
                                XFixesSetSelectionOwnerNotifyMask |
                                XFixesSelectionWindowDestroyNotifyMask |
                                XFixesSelectionClientCloseNotifyMask);
 
     base::MessagePumpX11::Current()->AddObserver(this);
   }
 }
 
 SelectionChangeObserver::~SelectionChangeObserver() {
@@ skipping 188 matching lines @@
   SelectionFormatMap clipboard_data_;
 
   // Objects which offer selection data to other windows.
   SelectionOwner clipboard_owner_;
   SelectionOwner primary_owner_;
 
   DISALLOW_COPY_AND_ASSIGN(AuraX11Details);
 };
 
 Clipboard::AuraX11Details::AuraX11Details()
-    : x_display_(GetXDisplay()),
+    : x_display_(gfx::GetXDisplay()),
       x_root_window_(DefaultRootWindow(x_display_)),
       x_window_(XCreateWindow(
           x_display_, x_root_window_,
           -100, -100, 10, 10,  // x, y, width, height
           0,                   // border width
           CopyFromParent,      // depth
           InputOnly,
           CopyFromParent,      // visual
           0,
           NULL)),
@@ skipping 535 matching lines @@
   return type;
 }
 
 // static
 const Clipboard::FormatType& Clipboard::GetPepperCustomDataFormatType() {
   CR_DEFINE_STATIC_LOCAL(FormatType, type, (kMimeTypePepperCustomData));
   return type;
 }
 
 }  // namespace ui