Moves ownership of MenuItemView to MenuRunner as well as responbility

chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.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 "chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_context_menu_model.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/views/browser_actions_container.h"
 #include "chrome/browser/ui/views/extensions/browser_action_drag_data.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_action.h"
 #include "ui/gfx/canvas_skia.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/controls/menu/submenu_view.h"
 #include "views/widget/widget.h"
 
 BrowserActionOverflowMenuController::BrowserActionOverflowMenuController(
     BrowserActionsContainer* owner,
     views::MenuButton* menu_button,
     const std::vector<BrowserActionView*>& views,
     int start_index)
     : owner_(owner),
       observer_(NULL),
       menu_button_(menu_button),
+      menu_(NULL),
       views_(&views),
       start_index_(start_index),
       for_drop_(false) {
-  menu_.reset(new views::MenuItemView(this));
+  menu_ = new views::MenuItemView(this);
+  menu_runner_.reset(new views::MenuRunner(menu_));
   menu_->set_has_icons(true);
 
   size_t command_id = 1;  // Menu id 0 is reserved, start with 1.
   for (size_t i = start_index; i < views_->size(); ++i) {
     BrowserActionView* view = (*views_)[i];
     scoped_ptr<gfx::Canvas> canvas(view->GetIconWithBadge());
     menu_->AppendMenuItemWithIcon(
         command_id,
         UTF8ToWide(view->button()->extension()->name()),
         canvas->AsCanvasSkia()->ExtractBitmap());
@@ skipping 17 matching lines @@
                                                   bool for_drop) {
   for_drop_ = for_drop;
 
   gfx::Rect bounds = menu_button_->bounds();
   gfx::Point screen_loc;
   views::View::ConvertPointToScreen(menu_button_, &screen_loc);
   bounds.set_x(screen_loc.x());
   bounds.set_y(screen_loc.y());
 
   views::MenuItemView::AnchorPosition anchor = views::MenuItemView::TOPRIGHT;
-  if (for_drop) {
-    menu_->RunMenuForDropAt(window, bounds, anchor);
-  } else {
-    menu_->RunMenuAt(window, menu_button_, bounds, anchor, false);
+  // As we maintain our own lifetime we can safely ignore the result.
+  ignore_result(menu_runner_->RunMenuAt(window, menu_button_, bounds, anchor,
+      for_drop_ ? views::MenuRunner::FOR_DROP : 0));
+  if (!for_drop_) {
     // Give the context menu (if any) a chance to execute the user-selected
     // command.
     MessageLoop::current()->DeleteSoon(FROM_HERE, this);
   }
   return true;
 }
 
 void BrowserActionOverflowMenuController::CancelMenu() {
   menu_->Cancel();
 }
@@ skipping 11 matching lines @@
     bool is_mouse_gesture) {
   const Extension* extension =
       (*views_)[start_index_ + id - 1]->button()->extension();
   if (!extension->ShowConfigureContextMenus())
     return false;
 
   scoped_refptr<ExtensionContextMenuModel> context_menu_contents =
       new ExtensionContextMenuModel(extension, owner_->browser(), owner_);
   views::MenuModelAdapter context_menu_model_adapter(
       context_menu_contents.get());
-  views::MenuItemView context_menu(&context_menu_model_adapter);
-  context_menu_model_adapter.BuildMenu(&context_menu);
+  views::MenuRunner context_menu_runner(
+      context_menu_model_adapter.CreateMenu());
 
+  // We can ignore the result as we delete ourself.
   // This blocks until the user choses something or dismisses the menu.
-  context_menu.RunMenuAt(menu_button_->GetWidget(),
-      NULL, gfx::Rect(p, gfx::Size()), views::MenuItemView::TOPLEFT, true);
+  ignore_result(context_menu_runner.RunMenuAt(menu_button_->GetWidget(),
+      NULL, gfx::Rect(p, gfx::Size()), views::MenuItemView::TOPLEFT,
+      views::MenuRunner::HAS_MNEMONICS | views::MenuRunner::IS_NESTED));
 
   // The user is done with the context menu, so we can close the underlying
   // menu.
   menu_->Cancel();
 
   return true;
 }
 
 void BrowserActionOverflowMenuController::DropMenuClosed(
     views::MenuItemView* menu) {
@@ skipping 86 matching lines @@
 
 BrowserActionView* BrowserActionOverflowMenuController::ViewForId(
     int id, size_t* index) {
   // The index of the view being dragged (GetCommand gives a 1-based index into
   // the overflow menu).
   size_t view_index = owner_->VisibleBrowserActions() + id - 1;
   if (index)
     *index = view_index;
   return owner_->GetBrowserActionViewAt(view_index);
 }