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

ui/base/x/events_x.cc

Index: ui/base/x/events_x.cc
diff --git a/ui/base/x/events_x.cc b/ui/base/x/events_x.cc
index baa3bcf7bdc113c792b58bf7032a3e7d4b35f181..06301a9b08607b61d8eed7b9e555bee01d61f546 100644
--- a/ui/base/x/events_x.cc
+++ b/ui/base/x/events_x.cc
@@ -260,7 +260,7 @@ double GetTouchParamFromXEvent(XEvent* xev,
 }
 
 Atom GetNoopEventAtom() {
-  return XInternAtom(ui::GetXDisplay(), "noop", False);
+  return XInternAtom(gfx::GetXDisplay(), "noop", False);
 }
 
 }  // namespace
@@ -268,7 +268,7 @@ Atom GetNoopEventAtom() {
 namespace ui {
 
 void UpdateDeviceList() {
-  Display* display = GetXDisplay();
+  XDisplay* display = gfx::GetXDisplay();
   DeviceListCacheX::GetInstance()->UpdateDeviceList(display);
   TouchFactory::GetInstance()->UpdateDeviceList(display);
   DeviceDataManager::GetInstance()->UpdateDeviceList(display);