ui/aura/root_window_host_x11.cc - Issue 23622035: x11: Prefer using ui::GetXDisplay() over getting the Display from the X11 message-pump.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/aura/root_window_host_x11.cc

Issue 23622035: x11: Prefer using ui::GetXDisplay() over getting the Display from the X11 message-pump. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

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

Index: ui/aura/root_window_host_x11.cc

diff --git a/ui/aura/root_window_host_x11.cc b/ui/aura/root_window_host_x11.cc

index 56f311b0b1a14cf12483f047ab15af23299825a0..3dec16906ec4617a5e65641fac77ed2f4e7eefc4 100644

--- a/ui/aura/root_window_host_x11.cc

+++ b/ui/aura/root_window_host_x11.cc

@@ -363,7 +363,7 @@ class RootWindowHostX11::MouseMoveFilter {

RootWindowHostX11::RootWindowHostX11(const gfx::Rect& bounds)

: delegate_(NULL),

- xdisplay_(base::MessagePumpX11::GetDefaultXDisplay()),

+ xdisplay_(ui::GetXDisplay()),

xwindow_(0),

x_root_window_(DefaultRootWindow(xdisplay_)),

current_cursor_(ui::kCursorNull),

@@ -1090,7 +1090,7 @@ RootWindowHost* RootWindowHost::Create(const gfx::Rect& bounds) {

// static

gfx::Size RootWindowHost::GetNativeScreenSize() {

- ::Display* xdisplay = base::MessagePumpX11::GetDefaultXDisplay();

+ ::Display* xdisplay = ui::GetXDisplay();

return gfx::Size(DisplayWidth(xdisplay, 0), DisplayHeight(xdisplay, 0));

}

« no previous file with comments | « ash/display/mirror_window_controller.cc ('k') | ui/aura/test/ui_controls_factory_aurax11.cc » ('j') | no next file with comments »