views/controls/menu/menu_controller.h - Issue 7464027: Wayland support for views. views_desktop on Wayland.

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 7464027: Wayland support for views. views_desktop on Wayland. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: Merged native_menu_wayland and native_menu_x and styling fixes Created 9 years, 4 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 84efb5bf44f1f6cb0c9fc07c2a858c29cf6885bf..2246b01248923a9e882d3c7d5fb9b93bd6202b05 100644

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

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

@@ -215,6 +215,9 @@ class VIEWS_EXPORT MenuController : public MessageLoop::Dispatcher {

// Dispatcher method. This returns true if the menu was canceled, or

// if the message is such that the menu should be closed.

virtual bool Dispatch(const MSG& msg);

+#elif defined(USE_WAYLAND)

+ virtual base::MessagePumpDispatcher::DispatchStatus Dispatch(

+ ui::WaylandEvent* event);

#elif defined(TOUCH_UI)

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

#else