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

ui/views/widget/desktop_aura/x11_window_event_filter.h

Index: ui/views/widget/desktop_aura/x11_window_event_filter.h
diff --git a/ui/views/widget/desktop_aura/x11_window_event_filter.h b/ui/views/widget/desktop_aura/x11_window_event_filter.h
index a02eab2798ea0d847e835d6750604a96ae4fff4d..9fab5a6fca01c5ac4b674d4f6bac2071a346a5b2 100644
--- a/ui/views/widget/desktop_aura/x11_window_event_filter.h
+++ b/ui/views/widget/desktop_aura/x11_window_event_filter.h
@@ -13,6 +13,7 @@
 #include "base/message_loop/message_loop.h"
 #include "ui/base/x/x11_atom_cache.h"
 #include "ui/events/event_handler.h"
+#include "ui/gfx/x/x11_types.h"
 #include "ui/views/views_export.h"
 
 namespace aura {
@@ -46,7 +47,7 @@ class VIEWS_EXPORT X11WindowEventFilter : public ui::EventHandler {
                                       const gfx::Point& screen_location);
 
   // The display and the native X window hosting the root window.
-  Display* xdisplay_;
+  XDisplay* xdisplay_;
   ::Window xwindow_;
 
   // The native root window.