Cleanup MenuRunner API

chrome/browser/ui/views/bookmarks/bookmark_context_menu.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_context_menu.h"
 
 #include "base/command_line.h"
 #include "base/i18n/rtl.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
@@ skipping 36 matching lines @@
           browser,
           profile,
           page_navigator,
           parent,
           selection)),
       parent_widget_(parent_widget),
       menu_(new views::MenuItemView(this)),
       menu_runner_(new views::MenuRunner(menu_,
                                          views::MenuRunner::HAS_MNEMONICS |
                                              views::MenuRunner::IS_NESTED |
-                                             views::MenuRunner::CONTEXT_MENU |
-                                             views::MenuRunner::ASYNC)),
+                                             views::MenuRunner::CONTEXT_MENU)),
       observer_(NULL),
       close_on_remove_(close_on_remove) {
   ui::SimpleMenuModel* menu_model = controller_->menu_model();
   for (int i = 0; i < menu_model->GetItemCount(); ++i) {
     views::MenuModelAdapter::AppendMenuItemFromModel(
         menu_model, i, menu_, menu_model->GetCommandIdAt(i));
   }
 }
 
 BookmarkContextMenu::~BookmarkContextMenu() {
@@ skipping 34 matching lines @@
 }
 
 bool BookmarkContextMenu::IsCommandVisible(int command_id) const {
   return controller_->IsCommandIdVisible(command_id);
 }
 
 bool BookmarkContextMenu::ShouldCloseAllMenusOnExecute(int id) {
   return (id != IDC_BOOKMARK_BAR_REMOVE) || close_on_remove_;
 }
 
-void BookmarkContextMenu::OnMenuClosed(views::MenuItemView* menu,
-                                       views::MenuRunner::RunResult result) {
+void BookmarkContextMenu::OnMenuClosed(views::MenuItemView* menu) {
   if (observer_)
     observer_->OnContextMenuClosed();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // BookmarkContextMenuControllerDelegate
 // implementation:
 
 void BookmarkContextMenu::CloseMenu() {
   menu_->Cancel();
 }
 
 void BookmarkContextMenu::WillExecuteCommand(
     int command_id,
     const std::vector<const BookmarkNode*>& bookmarks) {
   if (observer_ && IsRemoveBookmarksCommand(command_id))
     observer_->WillRemoveBookmarks(bookmarks);
 }
 
 void BookmarkContextMenu::DidExecuteCommand(int command_id) {
   if (observer_ && IsRemoveBookmarksCommand(command_id))
     observer_->DidRemoveBookmarks();
 }