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

ui/base/ime/character_composer.cc

Index: ui/base/ime/character_composer.cc
diff --git a/ui/base/ime/character_composer.cc b/ui/base/ime/character_composer.cc
index 27cdbece9c526d64dbd6d00bc3a60c2156cffcf8..6fff429a2ac9f7327bfdfae00939bd3b1f2eff48 100644
--- a/ui/base/ime/character_composer.cc
+++ b/ui/base/ime/character_composer.cc
@@ -15,8 +15,8 @@
 // '#define GDK_KeyName 0xNNNN' macros and does not #include any Gtk headers.
 #include "third_party/gtk+/gdk/gdkkeysyms.h"
 #include "ui/base/glib/glib_integers.h"
-#include "ui/base/x/x11_util.h"
 #include "ui/events/event_constants.h"
+#include "ui/gfx/x/x11_types.h"
 
 // Note for Gtk removal: gtkimcontextsimpleseqs.h does not #include any Gtk
 // headers and only contains one big guint16 array |gtk_compose_seqs_compact|
@@ -371,7 +371,7 @@ bool UTF32CharacterToUTF16(uint32 character, string16* output) {
 
 // Converts a X keycode to a X keysym with no modifiers.
 KeySym XKeyCodeToXKeySym(unsigned int keycode) {
-  Display* display = ui::GetXDisplay();
+  XDisplay* display = gfx::GetXDisplay();
   if (!display)
     return NoSymbol;