diff options
Diffstat (limited to 'chromium/ui/base/ime/character_composer.cc')
| -rw-r--r-- | chromium/ui/base/ime/character_composer.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chromium/ui/base/ime/character_composer.cc b/chromium/ui/base/ime/character_composer.cc index 0402be2ba97..6fff429a2ac 100644 --- a/chromium/ui/base/ime/character_composer.cc +++ b/chromium/ui/base/ime/character_composer.cc @@ -14,9 +14,9 @@ // 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/events/event_constants.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; |