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

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: Updated native_widget_wayland.cc to match compositor changes 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
« no previous file with comments | « views/controls/menu/menu_controller.h ('k') | views/controls/menu/menu_image_util_gtk.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/controls/menu/menu_controller.cc
diff --git a/views/controls/menu/menu_controller.cc b/views/controls/menu/menu_controller.cc
index 7cfbb3a3173f1ae40536bce42cac898c98d43c74..185899337311d32812a0205d21ff2f0a61d7a1e0 100644
--- a/views/controls/menu/menu_controller.cc
+++ b/views/controls/menu/menu_controller.cc
@@ -869,6 +869,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) {
« no previous file with comments | « views/controls/menu/menu_controller.h ('k') | views/controls/menu/menu_image_util_gtk.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698