views/controls/menu/menu_controller.h - Issue 7739016: aura-views: Make views_aura_desktop compile and run 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: views/controls/menu/menu_controller.h

Issue 7739016: aura-views: Make views_aura_desktop compile and run on linux. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 9 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:

Index: views/controls/menu/menu_controller.h

diff --git a/views/controls/menu/menu_controller.h b/views/controls/menu/menu_controller.h

index 91f4d792d1268d0d3ea222505dc21bd3e8573a54..0064f9872ae5556f868dd6abea4d83ad877db7da 100644

--- a/views/controls/menu/menu_controller.h

+++ b/views/controls/menu/menu_controller.h

@@ -222,7 +222,7 @@ class VIEWS_EXPORT MenuController : public MessageLoop::Dispatcher {

#elif defined(USE_WAYLAND)

virtual base::MessagePumpDispatcher::DispatchStatus Dispatch(

ui::WaylandEvent* event);

-#elif defined(TOUCH_UI)

+#elif defined(TOUCH_UI) || defined(USE_AURA)

virtual base::MessagePumpDispatcher::DispatchStatus Dispatch(XEvent* xevent);

#else

virtual bool Dispatch(GdkEvent* event);