diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-14 21:13:20 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-14 21:13:20 +0000 |
| commit | c8ef1d0bc63aa014ba0fb94049671b371c0d5d18 (patch) | |
| tree | f3f7a66331dde62271d9f9aeac0618cb9a07946b /chrome | |
| parent | 4b05a7bb244c80ffd75fd67cbb8d55f6735a5e04 (diff) | |
| download | chromium_src-c8ef1d0bc63aa014ba0fb94049671b371c0d5d18.zip chromium_src-c8ef1d0bc63aa014ba0fb94049671b371c0d5d18.tar.gz chromium_src-c8ef1d0bc63aa014ba0fb94049671b371c0d5d18.tar.bz2 | |
x11: Remove X11 message-pump.
The remaining use of the X11 mesage-pump was opening the connection to the
X11 server. This patch moves that out of the message-pump, into gfx. This
allows us to remove the X11 message-pump, and just use the base Glib-based
message-pump on Linux and ChromeOS.
BUG=354062
R=darin@chromium.org, sky@chromium.org
Review URL: https://codereview.chromium.org/235043005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@263726 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/ui/libgtk2ui/gtk2_event_loop.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/ui/libgtk2ui/x11_input_method_context_impl_gtk2.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/ui/libgtk2ui/gtk2_event_loop.cc b/chrome/browser/ui/libgtk2ui/gtk2_event_loop.cc index fe32abd..9f71177 100644 --- a/chrome/browser/ui/libgtk2ui/gtk2_event_loop.cc +++ b/chrome/browser/ui/libgtk2ui/gtk2_event_loop.cc @@ -10,7 +10,7 @@ #include <X11/X.h> #include "base/memory/singleton.h" -#include "base/message_loop/message_pump_x11.h" +#include "ui/gfx/x/x11_types.h" namespace libgtk2ui { @@ -66,7 +66,7 @@ void Gtk2EventLoop::ProcessGdkEventKey(const GdkEventKey& gdk_event_key) { x_event.xkey.type = gdk_event_key.type == GDK_KEY_PRESS ? KeyPress : KeyRelease; x_event.xkey.send_event = gdk_event_key.send_event; - x_event.xkey.display = base::MessagePumpX11::GetDefaultXDisplay(); + x_event.xkey.display = gfx::GetXDisplay(); x_event.xkey.window = GDK_WINDOW_XID(gdk_event_key.window); x_event.xkey.root = DefaultRootWindow(x_event.xkey.display); x_event.xkey.time = gdk_event_key.time; diff --git a/chrome/browser/ui/libgtk2ui/x11_input_method_context_impl_gtk2.cc b/chrome/browser/ui/libgtk2ui/x11_input_method_context_impl_gtk2.cc index 618d750..948314e 100644 --- a/chrome/browser/ui/libgtk2ui/x11_input_method_context_impl_gtk2.cc +++ b/chrome/browser/ui/libgtk2ui/x11_input_method_context_impl_gtk2.cc @@ -20,6 +20,7 @@ #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 { @@ -103,8 +104,7 @@ X11InputMethodContextImplGtk2::X11InputMethodContextImplGtk2( 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]); |