Make selection_owner.h not include Xlib.h for consistency.

ui/base/x/selection_owner.h

 // 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.
 
 #ifndef UI_BASE_X_SELECTION_OWNER_H_
 #define UI_BASE_X_SELECTION_OWNER_H_
 
-#include <X11/Xlib.h>
-
-// Get rid of a macro from Xlib.h that conflicts with Aura's RootWindow class.
-#undef RootWindow
-
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "ui/base/ui_base_export.h"
 #include "ui/base/x/selection_utils.h"
 #include "ui/gfx/x/x11_atom_cache.h"
+#include "ui/gfx/x/x11_types.h"
 
 namespace ui {
 
 // Owns a specific X11 selection on an X window.
 //
 // The selection owner object keeps track of which xwindow is the current
 // owner, and when its |xwindow_|, offers different data types to other
 // processes.
 class UI_BASE_EXPORT SelectionOwner {
  public:
-  SelectionOwner(Display* xdisplay,
-                 ::Window xwindow,
-                 ::Atom selection_name);
+  SelectionOwner(XDisplay* xdisplay,
+                 XID xwindow,
+                 XAtom selection_name);
   ~SelectionOwner();
 
   // Returns the current selection data. Useful for fast paths.
   const SelectionFormatMap& selection_format_map() { return format_map_; }
 
   // Appends a list of types we're offering to |targets|.
-  void RetrieveTargets(std::vector<Atom>* targets);
+  void RetrieveTargets(std::vector<XAtom>* targets);
 
   // Attempts to take ownership of the selection. If we're successful, present
   // |data| to other windows.
   void TakeOwnershipOfSelection(const SelectionFormatMap& data);
 
   // Clears our internal format map and clears the selection owner, whether we
   // own the selection or not.
   void ClearSelectionOwner();
 
   // It is our owner's responsibility to plumb X11 events on |xwindow_| to us.
-  void OnSelectionRequest(const XSelectionRequestEvent& event);
-  void OnSelectionClear(const XSelectionClearEvent& event);
+  void OnSelectionRequest(const XEvent& event);
+  void OnSelectionClear(const XEvent& event);
   // TODO(erg): Do we also need to follow PropertyNotify events? We currently
   // don't, but there were open todos in the previous implementation.
 
  private:
   // Attempts to convert the selection to |target|. If the conversion is
   // successful, true is returned and the result is stored in the |property|
   // of |requestor|.
-  bool ProcessTarget(::Atom target, ::Window requestor, ::Atom property);
+  bool ProcessTarget(XAtom target, XID requestor, XAtom property);
 
   // Our X11 state.
-  Display* x_display_;
-  ::Window x_window_;
+  XDisplay* x_display_;
+  XID x_window_;
 
   // The X11 selection that this instance communicates on.
-  ::Atom selection_name_;
+  XAtom selection_name_;
 
   // The data we are currently serving.
   SelectionFormatMap format_map_;
 
   X11AtomCache atom_cache_;
 
   DISALLOW_COPY_AND_ASSIGN(SelectionOwner);
 };
 
 }  // namespace ui
 
 #endif  // UI_BASE_X_SELECTION_OWNER_H_