Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(346)

Unified Diff: trunk/src/chrome/browser/ui/libgtk2ui/gtk2_event_loop.cc

Issue 238093002: Revert 263726 "x11: Remove X11 message-pump." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: trunk/src/chrome/browser/ui/libgtk2ui/gtk2_event_loop.cc
===================================================================
--- trunk/src/chrome/browser/ui/libgtk2ui/gtk2_event_loop.cc (revision 263732)
+++ trunk/src/chrome/browser/ui/libgtk2ui/gtk2_event_loop.cc (working copy)
@@ -10,7 +10,7 @@
#include <X11/X.h>
#include "base/memory/singleton.h"
-#include "ui/gfx/x/x11_types.h"
+#include "base/message_loop/message_pump_x11.h"
namespace libgtk2ui {
@@ -66,7 +66,7 @@
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 = gfx::GetXDisplay();
+ x_event.xkey.display = base::MessagePumpX11::GetDefaultXDisplay();
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;

Powered by Google App Engine
This is Rietveld 408576698