ui/base/x/events_x.cc - Issue 10441028: aura/cros: Rename MessagePump{X => AuraX11} and move the atom cache into it.

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/base/x/events_x.cc

Issue 10441028: aura/cros: Rename MessagePump{X => AuraX11} and move the atom cache into it. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix compile error in file added in the interim Created 8 years, 7 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/base/x/events_x.cc

diff --git a/ui/base/x/events_x.cc b/ui/base/x/events_x.cc

index ce97b81c9c28427e4f0b19241d8b60f8f12ba567..35f583d9795cf2017cc1e1a2191e094960d4685f 100644

--- a/ui/base/x/events_x.cc

+++ b/ui/base/x/events_x.cc

@@ -11,7 +11,7 @@

#include "base/command_line.h"

#include "base/logging.h"

-#include "base/message_pump_x.h"

+#include "base/message_pump_aurax11.h"

#include "ui/base/keycodes/keyboard_code_conversion_x.h"

#include "ui/base/ui_base_switches.h"

#include "ui/base/touch/touch_factory.h"

@@ -563,7 +563,7 @@ float GetTouchParamFromXEvent(XEvent* xev,

Atom GetNoopEventAtom() {

return XInternAtom(

- base::MessagePumpX::GetDefaultXDisplay(),

+ base::MessagePumpAuraX11::GetDefaultXDisplay(),

"noop", False);

}

« no previous file with comments | « ui/aura/x11_atom_cache.cc ('k') | ui/views/widget/x11_window_event_filter.cc » ('j') | no next file with comments »