views/controls/menu/menu_controller.cc - 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.cc

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.cc

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

index acad114c0ebd9ca22af66a94815f9a0d7dbbc551..1255610e80345d793fce8bceee47358a2efe1de6 100644

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

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

@@ -877,6 +877,12 @@ base::MessagePumpDispatcher::DispatchStatus

base::MessagePumpDispatcher::EVENT_QUIT :

base::MessagePumpDispatcher::EVENT_PROCESSED;

}

+#elif defined(USE_AURA)

+base::MessagePumpDispatcher::DispatchStatus

+ MenuController::Dispatch(XEvent* xev) {

+ NOTREACHED();

+ return EVENT_PROCESSED;

#elif defined(TOUCH_UI)

base::MessagePumpDispatcher::DispatchStatus

MenuController::Dispatch(XEvent* xev) {