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

chrome/browser/ui/ash/event_rewriter.cc

Index: chrome/browser/ui/ash/event_rewriter.cc
diff --git a/chrome/browser/ui/ash/event_rewriter.cc b/chrome/browser/ui/ash/event_rewriter.cc
index cc3633a2a7e4a62c25a228441b99336b5f2b84be..f80b08dfff6744843661c88e8ea7a92085b1ab16 100644
--- a/chrome/browser/ui/ash/event_rewriter.cc
+++ b/chrome/browser/ui/ash/event_rewriter.cc
@@ -237,7 +237,7 @@ void EventRewriter::DeviceAdded(int device_id) {
   }
 
   int ndevices_return = 0;
-  XIDeviceInfo* device_info = XIQueryDevice(ui::GetXDisplay(),
+  XIDeviceInfo* device_info = XIQueryDevice(gfx::GetXDisplay(),
                                             device_id,
                                             &ndevices_return);
 
@@ -282,7 +282,7 @@ KeyCode EventRewriter::NativeKeySymToNativeKeycode(KeySym keysym) {
   if (keysym_to_keycode_map_.count(keysym))
     return keysym_to_keycode_map_[keysym];
 
-  Display* display = ui::GetXDisplay();
+  XDisplay* display = gfx::GetXDisplay();
   KeyCode keycode = XKeysymToKeycode(display, keysym);
   keysym_to_keycode_map_[keysym] = keycode;
   return keycode;