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

ui/base/ime/character_composer.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/base/ime/character_composer.h"
 
 #include <X11/Xlib.h>
 
 #include <algorithm>
 #include <iterator>
 
 #include "base/strings/utf_string_conversions.h"
 #include "base/third_party/icu/icu_utf.h"
 // Note for Gtk removal: gdkkeysyms.h only contains a set of
 // '#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|
 // which defines the main compose table. The table has internal linkage.
 // The order of header inclusion is out of order because
 // gtkimcontextsimpleseqs.h depends on guint16, which is defined in
 // "ui/base/glib/glib_integers.h".
 #include "third_party/gtk+/gtk/gtkimcontextsimpleseqs.h"
 
 namespace {
@@ skipping 334 matching lines @@
   if (character) {
     output->resize(CBU16_LENGTH(character));
     size_t i = 0;
     CBU16_APPEND_UNSAFE(&(*output)[0], i, character);
   }
   return true;
 }
 
 // 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;
 
   XKeyEvent x_key_event = {0};
   x_key_event.type = KeyPress;
   x_key_event.display = display;
   x_key_event.keycode = keycode;
   return ::XLookupKeysym(&x_key_event, 0);
 }
 
@@ skipping 158 matching lines @@
   std::string preedit_string_ascii("u");
   for (size_t i = 0; i != compose_buffer_.size(); ++i) {
     const int digit = compose_buffer_[i];
     DCHECK(0 <= digit && digit < 16);
     preedit_string_ascii += digit <= 9 ? ('0' + digit) : ('a' + (digit - 10));
   }
   preedit_string_ = ASCIIToUTF16(preedit_string_ascii);
 }
 
 }  // namespace ui