Cleanup MenuRunner API

chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.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 "chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.h"
 
 #include "base/stl_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_stats.h"
 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"
@@ skipping 20 matching lines @@
                                                int start_child_index,
                                                bool for_drop)
     : menu_delegate_(new BookmarkMenuDelegate(browser, page_navigator, parent)),
       node_(node),
       observer_(NULL),
       for_drop_(for_drop),
       bookmark_bar_(NULL) {
   menu_delegate_->Init(this, NULL, node, start_child_index,
                        BookmarkMenuDelegate::HIDE_PERMANENT_FOLDERS,
                        BOOKMARK_LAUNCH_LOCATION_BAR_SUBFOLDER);
-  int run_type = views::MenuRunner::ASYNC;
+  int run_type = 0;
   if (for_drop)
     run_type |= views::MenuRunner::FOR_DROP;
   menu_runner_.reset(new views::MenuRunner(menu_delegate_->menu(), run_type));
 }
 
 void BookmarkMenuController::RunMenuAt(BookmarkBarView* bookmark_bar) {
   bookmark_bar_ = bookmark_bar;
   views::MenuButton* menu_button = bookmark_bar_->GetMenuButtonForNode(node_);
   DCHECK(menu_button);
   views::MenuAnchorPosition anchor;
   bookmark_bar_->GetAnchorPositionForButton(menu_button, &anchor);
   gfx::Point 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(), menu_button->width(),
                    menu_button->height() - 1);
   menu_delegate_->GetBookmarkModel()->AddObserver(this);
   // 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,
-                                        ui::MENU_SOURCE_NONE));
+  menu_runner_->RunMenuAt(menu_delegate_->parent(), menu_button, bounds, anchor,
+                          ui::MENU_SOURCE_NONE);
 }
 
 void BookmarkMenuController::Cancel() {
   menu_delegate_->menu()->Cancel();
 }
 
 MenuItemView* BookmarkMenuController::menu() const {
   return menu_delegate_->menu();
 }
 
@@ skipping 69 matching lines @@
 
 void BookmarkMenuController::WriteDragData(MenuItemView* sender,
                                            ui::OSExchangeData* data) {
   return menu_delegate_->WriteDragData(sender, data);
 }
 
 int BookmarkMenuController::GetDragOperations(MenuItemView* sender) {
   return menu_delegate_->GetDragOperations(sender);
 }
 
-void BookmarkMenuController::OnMenuClosed(views::MenuItemView* menu,
-                                          views::MenuRunner::RunResult result) {
+void BookmarkMenuController::OnMenuClosed(views::MenuItemView* menu) {
   delete this;
 }
 
 views::MenuItemView* BookmarkMenuController::GetSiblingMenu(
     views::MenuItemView* menu,
     const gfx::Point& screen_point,
     views::MenuAnchorPosition* anchor,
     bool* has_mnemonics,
     views::MenuButton** button) {
   if (!bookmark_bar_ || for_drop_)
@@ skipping 24 matching lines @@
 void BookmarkMenuController::BookmarkModelChanged() {
   if (!menu_delegate_->is_mutating_model())
     menu()->Cancel();
 }
 
 BookmarkMenuController::~BookmarkMenuController() {
   menu_delegate_->GetBookmarkModel()->RemoveObserver(this);
   if (observer_)
     observer_->BookmarkMenuControllerDeleted(this);
 }