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

ui/views/widget/desktop_aura/x11_whole_screen_move_loop.cc

Index: ui/views/widget/desktop_aura/x11_whole_screen_move_loop.cc
diff --git a/ui/views/widget/desktop_aura/x11_whole_screen_move_loop.cc b/ui/views/widget/desktop_aura/x11_whole_screen_move_loop.cc
index 636da4351b472dcd9c8a181ef739bf18283af258..177d137a2dae9a9d6e9ab7de7a0d57d2bad76c65 100644
--- a/ui/views/widget/desktop_aura/x11_whole_screen_move_loop.cc
+++ b/ui/views/widget/desktop_aura/x11_whole_screen_move_loop.cc
@@ -64,7 +64,7 @@ bool X11WholeScreenMoveLoop::RunMoveLoop(aura::Window* source,
   DCHECK(!in_move_loop_);  // Can only handle one nested loop at a time.
   in_move_loop_ = true;
 
-  Display* display = ui::GetXDisplay();
+  XDisplay* display = gfx::GetXDisplay();
 
   // Creates an invisible, InputOnly toplevel window. This window will receive
   // all mouse movement for drags. It turns out that normal windows doing a
@@ -116,7 +116,7 @@ void X11WholeScreenMoveLoop::EndMoveLoop() {
   // the chrome process.
 
   // Ungrab before we let go of the window.
-  Display* display = ui::GetXDisplay();
+  XDisplay* display = gfx::GetXDisplay();
   XUngrabPointer(display, CurrentTime);
 
   base::MessagePumpX11::Current()->RemoveDispatcherForWindow(
@@ -129,7 +129,7 @@ void X11WholeScreenMoveLoop::EndMoveLoop() {
 }
 
 bool X11WholeScreenMoveLoop::GrabPointerWithCursor(gfx::NativeCursor cursor) {
-  Display* display = ui::GetXDisplay();
+  XDisplay* display = gfx::GetXDisplay();
   XGrabServer(display);
   XUngrabPointer(display, CurrentTime);
   int ret = XGrabPointer(