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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: trunk/src/ui/views/widget/desktop_aura/desktop_screen_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/views/test/ui_controls_factory_desktop_aurax11.cc ('k') | trunk/src/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/ui/views/widget/desktop_aura/desktop_screen_x11.cc
===================================================================
--- trunk/src/ui/views/widget/desktop_aura/desktop_screen_x11.cc (revision 263732)
+++ trunk/src/ui/views/widget/desktop_aura/desktop_screen_x11.cc (working copy)
@@ -120,7 +120,7 @@
// DesktopScreenX11, public:
DesktopScreenX11::DesktopScreenX11()
- : xdisplay_(gfx::GetXDisplay()),
+ : xdisplay_(base::MessagePumpX11::GetDefaultXDisplay()),
x_root_window_(DefaultRootWindow(xdisplay_)),
has_xrandr_(false),
xrandr_event_base_(0) {
@@ -342,7 +342,7 @@
DesktopScreenX11::DesktopScreenX11(
const std::vector<gfx::Display>& test_displays)
- : xdisplay_(gfx::GetXDisplay()),
+ : xdisplay_(base::MessagePumpX11::GetDefaultXDisplay()),
x_root_window_(DefaultRootWindow(xdisplay_)),
has_xrandr_(false),
xrandr_event_base_(0),
« no previous file with comments | « trunk/src/ui/views/test/ui_controls_factory_desktop_aurax11.cc ('k') | trunk/src/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698