Work in progress: Adds MessagePumpDispatcher::ShouldExit(). This is used to handle the

ui/views/controls/menu/menu_controller.cc

 // Copyright (c) 2012 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 "ui/views/controls/menu/menu_controller.h"
 
 #include "base/i18n/case_conversion.h"
 #include "base/i18n/rtl.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
@@ skipping 917 matching lines @@
       return true;
     default:
       break;
   }
 
   aura::Env::GetInstance()->GetDispatcher()->Dispatch(event);
   return exit_type_ == EXIT_NONE;
 }
 #endif
 
+bool MenuController::ShouldExit() OVERRIDE {
+  return exit_type_ != EXIT_NONE;
+}
+
 bool MenuController::OnKeyDown(ui::KeyboardCode key_code) {
   DCHECK(blocking_run_);
 
   switch (key_code) {
     case ui::VKEY_UP:
       IncrementSelection(-1);
       break;
 
     case ui::VKEY_DOWN:
       IncrementSelection(1);
@@ skipping 1017 matching lines @@
 
   // Reset the active_mouse_view_ before sending mouse capture lost. That way if
   // it calls back to us, we aren't in a weird state.
   View* active_view = active_mouse_view_;
   active_mouse_view_ = NULL;
   active_view->OnMouseCaptureLost();
 }
 
 void MenuController::SetExitType(ExitType type) {
   exit_type_ = type;
-#if defined(USE_AURA)
-  // On aura, closing menu may not trigger next native event, which
-  // is necessary to exit from nested loop (See Dispatch methods).
-  // Send non-op event so that Dispatch method will always be called.
-  // crbug.com/104684.
-  if (exit_type_ == EXIT_ALL || exit_type_ == EXIT_DESTROYED) {
-    owner_->GetNativeView()->GetRootWindow()->PostNativeEvent(
-        ui::CreateNoopEvent());
-  }
-#endif
 }
 
 void MenuController::HandleMouseLocation(SubmenuView* source,
                                          const gfx::Point& mouse_location) {
   if (showing_submenu_)
     return;
 
   MenuPart part = GetMenuPart(source, mouse_location);
 
   UpdateScrolling(part);
@@ skipping 11 matching lines @@
              (!pending_state_.item->HasSubmenu() ||
               !pending_state_.item->GetSubmenu()->IsShowing())) {
     // On exit if the user hasn't selected an item with a submenu, move the
     // selection back to the parent menu item.
     SetSelection(pending_state_.item->GetParentMenuItem(),
                  SELECTION_OPEN_SUBMENU);
   }
 }
 
 }  // namespace views