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

ui/base/touch/touch_factory_x11.cc

Index: ui/base/touch/touch_factory_x11.cc
diff --git a/ui/base/touch/touch_factory_x11.cc b/ui/base/touch/touch_factory_x11.cc
index ebf2ebbb769e0c28b8cef41c33c0564e885f1621..21fa6a2c7e4c0ee7b3b45371d3bc3f57b5232a7b 100644
--- a/ui/base/touch/touch_factory_x11.cc
+++ b/ui/base/touch/touch_factory_x11.cc
@@ -19,7 +19,7 @@
 #include "base/strings/string_split.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/base/x/device_list_cache_x.h"
-#include "ui/base/x/x11_util.h"
+#include "ui/gfx/x/x11_types.h"
 
 namespace ui {
 
@@ -37,7 +37,7 @@ TouchFactory::TouchFactory()
     return;
 #endif
 
-  Display* display = GetXDisplay();
+  XDisplay* display = gfx::GetXDisplay();
   UpdateDeviceList(display);
 
   CommandLine* cmdline = CommandLine::ForCurrentProcess();
@@ -177,7 +177,7 @@ void TouchFactory::SetupXI2ForXWindow(Window window) {
   // the events from uninteresting devices. We do the latter because that's
   // simpler.
 
-  Display* display = ui::GetXDisplay();
+  XDisplay* display = gfx::GetXDisplay();
 
   unsigned char mask[XIMaskLen(XI_LASTEVENT)];
   memset(mask, 0, sizeof(mask));