ui/views/widget/desktop_aura/x11_desktop_handler.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/views/widget/desktop_aura/x11_desktop_handler.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

« no previous file with comments | « ui/views/widget/desktop_aura/desktop_root_window_host_x11.cc ('k') | ui/views/widget/desktop_aura/x11_whole_screen_move_loop.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/views/widget/desktop_aura/x11_desktop_handler.cc

diff --git a/ui/views/widget/desktop_aura/x11_desktop_handler.cc b/ui/views/widget/desktop_aura/x11_desktop_handler.cc

index 6b2d3b58a082302a490d8105afae1ef2544f39ff..1b0ace7e9f5a91062669891443e8b9dfc26a1fed 100644

--- a/ui/views/widget/desktop_aura/x11_desktop_handler.cc

+++ b/ui/views/widget/desktop_aura/x11_desktop_handler.cc

@@ -38,7 +38,7 @@ X11DesktopHandler* X11DesktopHandler::get() {

}

X11DesktopHandler::X11DesktopHandler()

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

+ : xdisplay_(ui::GetXDisplay()),

x_root_window_(DefaultRootWindow(xdisplay_)),

current_window_(None),

atom_cache_(xdisplay_, kAtomsToCache) {

@@ -58,7 +58,7 @@ X11DesktopHandler::~X11DesktopHandler() {

}

void X11DesktopHandler::ActivateWindow(::Window window) {

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

+ DCHECK_EQ(ui::GetXDisplay(), xdisplay_);

XEvent xclient;

memset(&xclient, 0, sizeof(xclient));