A non-GTK version of menus for touchui.

views/controls/menu/menu_controller.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "views/controls/menu/menu_controller.h"
 
 #include "app/keyboard_codes.h"
 #include "app/l10n_util.h"
 #include "app/os_exchange_data.h"
 #include "base/i18n/rtl.h"
@@ skipping 843 matching lines @@
 
   // We don't want Gtk to handle keyboard events, otherwise if they get
   // handled by Gtk, unexpected behavior may occur. For example Tab key
   // may cause unexpected focus traversing.
   gtk_main_do_event(event);
   return exit_type_ == EXIT_NONE;
 }
 
 #if defined(TOUCH_UI)
 bool MenuController::Dispatch(XEvent* xev) {
-  return DispatchXEvent(xev);
+  if (!DispatchXEvent(xev))
+    return false;
+
+  // The event was handled and |exit_type_| was set. So terminate the event-loop
+  // that was started in MenuController::Run.
+  if (exit_type_ != EXIT_NONE) {
+    MessageLoopForUI::current()->QuitNow();

[sky, 2010/11/22 17:06:15]

How come you need the QuitNow instead of returning false?

[sadrul, 2010/11/22 18:48:22]

Dispatch(XEvent*) returns a value indicating whether the event was processed or
not. If the event was processed, then the message-pump proceeds as usual. If it
wasn't, then the message-pump lets the GDK dispatcher process it (through
Dispatch(GdkEvent*)). i.e., the message-pump doesn't terminate based on the
return value. So we need to explicitly terminate it here.

[sky, 2010/11/22 19:23:01]

The docs don't indicate that. Doesn't that make for an inconsistent
implementation? One Dispatcher continues, the other exits? Wouldn't it be better
to have the X variant return an enum?

+  }
+  return true;
 }
 #endif
 
 #endif
 
 bool MenuController::OnKeyDown(int key_code
 #if defined(OS_WIN)
                                , const MSG& msg
 #else
 #endif
@@ skipping 935 matching lines @@
 
   MouseEvent release_event(Event::ET_MOUSE_RELEASED, -1, -1, 0);
   // Reset the active_mouse_view_ before sending mouse released. That way if if
   // calls back to use we aren't in a weird state.
   View* active_view = active_mouse_view_;
   active_mouse_view_ = NULL;
   active_view->OnMouseReleased(release_event, true);
 }
 
 }  // namespace views