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

Unified Diff: trunk/src/ui/display/chromeos/x11/touchscreen_delegate_x11.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
« no previous file with comments | « trunk/src/ui/base/x/x11_util.cc ('k') | trunk/src/ui/display/x11/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/ui/display/chromeos/x11/touchscreen_delegate_x11.cc
===================================================================
--- trunk/src/ui/display/chromeos/x11/touchscreen_delegate_x11.cc (revision 263732)
+++ trunk/src/ui/display/chromeos/x11/touchscreen_delegate_x11.cc (working copy)
@@ -10,14 +10,14 @@
#include <cmath>
#include <set>
+#include "base/message_loop/message_pump_x11.h"
#include "ui/display/chromeos/display_mode.h"
#include "ui/display/chromeos/display_snapshot.h"
-#include "ui/gfx/x/x11_types.h"
namespace ui {
TouchscreenDelegateX11::TouchscreenDelegateX11()
- : display_(gfx::GetXDisplay()) {}
+ : display_(base::MessagePumpX11::GetDefaultXDisplay()) {}
TouchscreenDelegateX11::~TouchscreenDelegateX11() {}
« no previous file with comments | « trunk/src/ui/base/x/x11_util.cc ('k') | trunk/src/ui/display/x11/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698