Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(988)

Unified Diff: views/controls/menu/menu_controller.cc

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:
View side-by-side diff with in-line comments
Download patch
Index: views/controls/menu/menu_controller.cc
diff --git a/views/controls/menu/menu_controller.cc b/views/controls/menu/menu_controller.cc
index c57ba0999c13401a6880e05f2506ba6de0e4dc77..b6bf074e3f52c9d5928f41d32103dff3c92cbc99 100644
--- a/views/controls/menu/menu_controller.cc
+++ b/views/controls/menu/menu_controller.cc
@@ -867,6 +867,13 @@ bool MenuController::Dispatch(const MSG& msg) {
DispatchMessage(&msg);
return exit_type_ == EXIT_NONE;
}
+#elif defined(USE_WAYLAND)
+base::MessagePumpDispatcher::DispatchStatus
+ MenuController::Dispatch(ui::WaylandEvent* ev) {
+ return exit_type_ != EXIT_NONE ?
+ base::MessagePumpDispatcher::EVENT_QUIT :
+ base::MessagePumpDispatcher::EVENT_PROCESSED;
+}
#elif defined(TOUCH_UI)
base::MessagePumpDispatcher::DispatchStatus
MenuController::Dispatch(XEvent* xev) {

Powered by Google App Engine
This is Rietveld 408576698