base/message_pump_x.cc - Issue 8143021: aura: Fix views_unittests on linux.

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: base/message_pump_x.cc

Issue 8143021: aura: Fix views_unittests on linux. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: removed textfield tests changes Created 9 years, 2 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:

Index: base/message_pump_x.cc

diff --git a/base/message_pump_x.cc b/base/message_pump_x.cc

index 45f24a6d77e6c2639fd705b630c6b414b5833177..4feab2d7804ee664c68065015deab32ab5a6b641 100644

--- a/base/message_pump_x.cc

+++ b/base/message_pump_x.cc

@@ -167,7 +167,7 @@ bool MessagePumpX::HasXInput2() {

void MessagePumpX::InitXSource() {

DCHECK(!x_source_);

GPollFD* x_poll = new GPollFD();

- x_poll->fd = ConnectionNumber(g_xdisplay);

+ x_poll->fd = ConnectionNumber(GetDefaultXDisplay());

x_poll->events = G_IO_IN;

x_source_ = g_source_new(&XSourceFuncs, sizeof(GSource));

« no previous file with comments | « no previous file | ui/aura/aura.gyp » ('j') | no next file with comments »