Moves ownership of MenuItemView to MenuRunner as well as responbility

chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.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/bookmarks/bookmark_menu_controller_views.h"
 
 #include "base/stl_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_node_data.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"
 #include "chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h"
 #include "chrome/browser/ui/views/event_utils.h"
 #include "chrome/common/pref_names.h"
 #include "content/browser/tab_contents/page_navigator.h"
 #include "content/browser/user_metrics.h"
 #include "content/common/page_transition_types.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/ui_resources.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "views/controls/button/menu_button.h"
+#include "views/controls/menu/menu_runner.h"
 #include "views/widget/widget.h"
 
 using views::MenuItemView;
 
 BookmarkMenuController::BookmarkMenuController(Profile* profile,
                                                PageNavigator* navigator,
                                                views::Widget* parent,
                                                const BookmarkNode* node,
                                                int start_child_index)
     : menu_delegate_(new BookmarkMenuDelegate(profile, navigator, parent, 1)),
       node_(node),
       observer_(NULL),
       for_drop_(false),
       bookmark_bar_(NULL) {
   menu_delegate_->Init(this, NULL, node, start_child_index,
                        BookmarkMenuDelegate::HIDE_OTHER_FOLDER);
+  menu_runner_.reset(new views::MenuRunner(menu_delegate_->menu()));
 }
 
 void BookmarkMenuController::RunMenuAt(BookmarkBarView* bookmark_bar,
                                        bool for_drop) {
   bookmark_bar_ = bookmark_bar;
   views::MenuButton* menu_button = bookmark_bar_->GetMenuButtonForNode(node_);
   DCHECK(menu_button);
   MenuItemView::AnchorPosition anchor;
   bookmark_bar_->GetAnchorPositionForButton(menu_button, &anchor);
-  RunMenuAt(menu_button, anchor, for_drop);
-}
-
-void BookmarkMenuController::RunMenuAt(
-    views::MenuButton* button,
-    MenuItemView::AnchorPosition position,
-    bool for_drop) {
   gfx::Point screen_loc;
-  views::View::ConvertPointToScreen(button, &screen_loc);
+  views::View::ConvertPointToScreen(menu_button, &screen_loc);
   // Subtract 1 from the height to make the popup flush with the button border.
-  gfx::Rect bounds(screen_loc.x(), screen_loc.y(), button->width(),
-                   button->height() - 1);
+  gfx::Rect bounds(screen_loc.x(), screen_loc.y(), menu_button->width(),
+                   menu_button->height() - 1);
   for_drop_ = for_drop;
   menu_delegate_->profile()->GetBookmarkModel()->AddObserver(this);
-  if (for_drop) {
-    menu()->RunMenuForDropAt(menu_delegate_->parent(), bounds, position);
-  } else {
-    menu()->RunMenuAt(menu_delegate_->parent(), button, bounds, position,
-                      false);
+  // We only delete ourself after the menu completes, so we can safely ignore
+  // the return value.
+  ignore_result(menu_runner_->RunMenuAt(menu_delegate_->parent(), menu_button,
+      bounds, anchor, for_drop ? views::MenuRunner::FOR_DROP : 0));
+  if (!for_drop)
     delete this;
-  }
 }
 
 void BookmarkMenuController::Cancel() {
   menu_delegate_->menu()->Cancel();
 }
 
 MenuItemView* BookmarkMenuController::menu() const {
   return menu_delegate_->menu();
 }
 
@@ skipping 101 matching lines @@
 void BookmarkMenuController::BookmarkModelChanged() {
   if (!menu_delegate_->is_mutating_model())
     menu()->Cancel();
 }
 
 BookmarkMenuController::~BookmarkMenuController() {
   menu_delegate_->profile()->GetBookmarkModel()->RemoveObserver(this);
   if (observer_)
     observer_->BookmarkMenuDeleted(this);
 }