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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: trunk/src/ui/aura/root_window_host_x11.cc

Issue 23943010: Revert 223621 "x11: Prefer using ui::GetXDisplay() over getting ..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 3 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/ash/display/mirror_window_controller.cc ('k') | trunk/src/ui/aura/test/ui_controls_factory_aurax11.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/ui/aura/root_window_host_x11.cc
===================================================================
--- trunk/src/ui/aura/root_window_host_x11.cc (revision 223638)
+++ trunk/src/ui/aura/root_window_host_x11.cc (working copy)
@@ -363,7 +363,7 @@
RootWindowHostX11::RootWindowHostX11(const gfx::Rect& bounds)
: delegate_(NULL),
- xdisplay_(ui::GetXDisplay()),
+ xdisplay_(base::MessagePumpX11::GetDefaultXDisplay()),
xwindow_(0),
x_root_window_(DefaultRootWindow(xdisplay_)),
current_cursor_(ui::kCursorNull),
@@ -1090,7 +1090,7 @@
// static
gfx::Size RootWindowHost::GetNativeScreenSize() {
- ::Display* xdisplay = ui::GetXDisplay();
+ ::Display* xdisplay = base::MessagePumpX11::GetDefaultXDisplay();
return gfx::Size(DisplayWidth(xdisplay, 0), DisplayHeight(xdisplay, 0));
}
« no previous file with comments | « trunk/src/ash/display/mirror_window_controller.cc ('k') | trunk/src/ui/aura/test/ui_controls_factory_aurax11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698