Moves ownership of MenuItemView to MenuRunner as well as responbility

views/controls/button/button_dropdown.cc

 // Copyright (c) 2011 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/button/button_dropdown.h"
 
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "grit/ui_strings.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/menu_model.h"
 #include "views/controls/menu/menu_item_view.h"
 #include "views/controls/menu/menu_model_adapter.h"
+#include "views/controls/menu/menu_runner.h"
 #include "views/widget/widget.h"
 
 namespace views {
 
 // static
 const char ButtonDropDown::kViewClassName[] =
     "views/controls/button/ButtonDropDown";
 
 // How long to wait before showing the menu
 static const int kMenuTimerDelay = 500;
@@ skipping 122 matching lines @@
   if (menu_position.x() < left_bound)
     menu_position.set_x(left_bound);
 
   // Make the button look depressed while the menu is open.
   SetState(BS_PUSHED);
 
   // Create and run menu.  Display an empty menu if model is NULL.
   if (model_) {
     MenuModelAdapter menu_delegate(model_);
     menu_delegate.set_triggerable_event_flags(triggerable_event_flags());
-    MenuItemView menu(&menu_delegate);
-    menu_delegate.BuildMenu(&menu);
-
-    menu.RunMenuAt(GetWidget(), NULL,
-                   gfx::Rect(menu_position, gfx::Size(0, 0)),
-                   views::MenuItemView::TOPLEFT,
-                   true);
+    MenuRunner runner(menu_delegate.CreateMenu());
+    if (runner.RunMenuAt(GetWidget(), NULL,
+                         gfx::Rect(menu_position, gfx::Size(0, 0)),
+                         MenuItemView::TOPLEFT,
+                         MenuRunner::HAS_MNEMONICS) == MenuRunner::MENU_DELETED)
+      return;
   } else {
     MenuDelegate menu_delegate;
-    MenuItemView menu(&menu_delegate);
-    menu.RunMenuAt(GetWidget(), NULL,
-                   gfx::Rect(menu_position, gfx::Size(0, 0)),
-                   views::MenuItemView::TOPLEFT,
-                   true);
+    MenuItemView* menu = new MenuItemView(&menu_delegate);
+    MenuRunner runner(menu);
+    if (runner.RunMenuAt(GetWidget(), NULL,
+                         gfx::Rect(menu_position, gfx::Size(0, 0)),
+                         views::MenuItemView::TOPLEFT,
+                         MenuRunner::HAS_MNEMONICS) == MenuRunner::MENU_DELETED)
+      return;
   }
 
   // Need to explicitly clear mouse handler so that events get sent
   // properly after the menu finishes running. If we don't do this, then
   // the first click to other parts of the UI is eaten.
   SetMouseHandler(NULL);
 
   // Set the state back to normal after the drop down menu is closed.
   if (state_ != BS_DISABLED)
     SetState(BS_NORMAL);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // ButtonDropDown - Accessibility
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 }  // namespace views