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

ash/display/display_controller.cc

Index: ash/display/display_controller.cc
diff --git a/ash/display/display_controller.cc b/ash/display/display_controller.cc
index 3ab258b6f0dafdbec268993e556d6ce93947f800..11b2fc8aa14ea4ef37b471f43557b0b87e890f57 100644
--- a/ash/display/display_controller.cc
+++ b/ash/display/display_controller.cc
@@ -44,6 +44,7 @@
 #include "ash/display/output_configurator_animation.h"
 #include "chromeos/display/output_configurator.h"
 #include "ui/base/x/x11_util.h"
+#include "ui/gfx/x/x11_types.h"
 
 // Including this at the bottom to avoid other
 // potential conflict with chrome headers.
@@ -824,7 +825,7 @@ void DisplayController::UpdateHostWindowNames() {
     std::string name =
         root_windows[i] == primary ? "aura_root_0" : "aura_root_x";
     gfx::AcceleratedWidget xwindow = root_windows[i]->GetAcceleratedWidget();
-    XStoreName(ui::GetXDisplay(), xwindow, name.c_str());
+    XStoreName(gfx::GetXDisplay(), xwindow, name.c_str());
   }
 #endif
 }