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

ui/aura/root_window_host_x11.cc

Index: ui/aura/root_window_host_x11.cc
diff --git a/ui/aura/root_window_host_x11.cc b/ui/aura/root_window_host_x11.cc
index 7de3bf73942e9d18e4a0e9578e98ba9735479576..abf1da06b9d9b20f240402b28e1c2e79fe3cd093 100644
--- a/ui/aura/root_window_host_x11.cc
+++ b/ui/aura/root_window_host_x11.cc
@@ -87,7 +87,7 @@ bool IsSideBezelsEnabled() {
 #endif
 
 void SelectEventsForRootWindow() {
-  Display* display = ui::GetXDisplay();
+  XDisplay* display = gfx::GetXDisplay();
   ::Window root_window = ui::GetX11RootWindow();
 
   // Receive resize events for the root-window so |x_root_bounds_| can be
@@ -363,7 +363,7 @@ class RootWindowHostX11::MouseMoveFilter {
 
 RootWindowHostX11::RootWindowHostX11(const gfx::Rect& bounds)
     : delegate_(NULL),
-      xdisplay_(ui::GetXDisplay()),
+      xdisplay_(gfx::GetXDisplay()),
       xwindow_(0),
       x_root_window_(DefaultRootWindow(xdisplay_)),
       current_cursor_(ui::kCursorNull),
@@ -1090,7 +1090,7 @@ RootWindowHost* RootWindowHost::Create(const gfx::Rect& bounds) {
 
 // static
 gfx::Size RootWindowHost::GetNativeScreenSize() {
-  ::Display* xdisplay = ui::GetXDisplay();
+  ::XDisplay* xdisplay = gfx::GetXDisplay();
   return gfx::Size(DisplayWidth(xdisplay, 0), DisplayHeight(xdisplay, 0));
 }