x11: Remove X11 message-pump.

chrome/browser/ui/libgtk2ui/x11_input_method_context_impl_gtk2.cc

 // Copyright 2013 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 "chrome/browser/ui/libgtk2ui/x11_input_method_context_impl_gtk2.h"
 
 #include <gdk/gdk.h>
 #include <gdk/gdkkeysyms.h>
 #include <gdk/gdkx.h>
 
 #include <gtk/gtk.h>
 
 #include <X11/X.h>
 #include <X11/Xlib.h>
 
 #include "base/event_types.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/base/ime/composition_text.h"
 #include "ui/base/ime/composition_text_util_pango.h"
 #include "ui/base/ime/text_input_client.h"
 #include "ui/events/event.h"
+#include "ui/gfx/x/x11_types.h"
 
 namespace {
 
 // Constructs a GdkEventKey from a XKeyEvent and returns it.  Otherwise,
 // returns NULL.  The returned GdkEvent must be freed by gdk_event_free.
 GdkEvent* GdkEventFromXKeyEvent(XKeyEvent& xkey, bool is_modifier) {
   DCHECK(xkey.type == KeyPress || xkey.type == KeyRelease);
 
   // Get a GdkDisplay.
   GdkDisplay* display = gdk_x11_lookup_xdisplay(xkey.display);
@@ skipping 63 matching lines @@
 
 X11InputMethodContextImplGtk2::X11InputMethodContextImplGtk2(
     ui::LinuxInputMethodContextDelegate* delegate)
     : delegate_(delegate),
       gtk_context_simple_(NULL),
       gtk_multicontext_(NULL),
       gtk_context_(NULL) {
   CHECK(delegate_);
 
   {
-    XModifierKeymap* keymap = XGetModifierMapping(
-        base::MessagePumpForUI::GetDefaultXDisplay());
+    XModifierKeymap* keymap = XGetModifierMapping(gfx::GetXDisplay());
     for (int i = 0; i < 8 * keymap->max_keypermod; ++i) {
       if (keymap->modifiermap[i])
         modifier_keycodes_.insert(keymap->modifiermap[i]);
     }
     XFreeModifiermap(keymap);
   }
 
   gtk_context_simple_ = gtk_im_context_simple_new();
   gtk_multicontext_ = gtk_im_multicontext_new();
 
@@ skipping 184 matching lines @@
       text.length() == 1 &&
       text[0] == gdk_keyval_to_unicode(gdk_event_key_keyval_)) {
     is_signal_caught_ = true;
     return true;
   } else {
     return false;
   }
 }
 
 }  // namespace libgtk2ui