Remove the Menu object, converting all the remaining callers to use Menu2. I'...

chrome/browser/views/bookmark_editor_view.cc

 // Copyright (c) 2006-2008 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/views/bookmark_editor_view.h"
 
 #include "app/l10n_util.h"
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/string_util.h"
@@ skipping 169 matching lines @@
   switch (sender->GetID()) {
     case kNewGroupButtonID:
       NewGroup();
       break;
 
     default:
       NOTREACHED();
   }
 }
 
-void BookmarkEditorView::ExecuteCommand(int id) {
+bool BookmarkEditorView::IsCommandIdChecked(int command_id) const {
+  return false;
+}
+
+bool BookmarkEditorView::IsCommandIdEnabled(int command_id) const {
+  return (command_id != IDS_EDIT || !running_menu_for_root_);
+}
+
+bool BookmarkEditorView::GetAcceleratorForCommandId(
+    int command_id,
+    views::Accelerator* accelerator) {
+  return GetWidget()->GetAccelerator(command_id, accelerator);
+}
+
+void BookmarkEditorView::ExecuteCommand(int command_id) {
   DCHECK(tree_view_->GetSelectedNode());
-  if (id == IDS_EDIT) {
+  if (command_id == IDS_EDIT) {
     tree_view_->StartEditing(tree_view_->GetSelectedNode());
   } else {
-    DCHECK(id == IDS_BOOMARK_EDITOR_NEW_FOLDER_MENU_ITEM);
+    DCHECK(command_id == IDS_BOOMARK_EDITOR_NEW_FOLDER_MENU_ITEM);
     NewGroup();
   }
 }
 
-bool BookmarkEditorView::IsCommandEnabled(int id) const {
-  return (id != IDS_EDIT || !running_menu_for_root_);
-}
-
 void BookmarkEditorView::Show(HWND parent_hwnd) {
   views::Window::CreateChromeWindow(parent_hwnd, gfx::Rect(), this);
   UserInputChanged();
   if (show_tree_ && bb_model_->IsLoaded())
     ExpandAndSelect();
   window()->Show();
   // Select all the text in the name Textfield.
   title_tf_.SelectAll();
   // Give focus to the name Textfield.
   title_tf_.RequestFocus();
 }
 
 void BookmarkEditorView::Close() {
   DCHECK(window());
   window()->Close();
 }
 
 void BookmarkEditorView::ShowContextMenu(View* source,
                                          int x,
                                          int y,
                                          bool is_mouse_gesture) {
   DCHECK(source == tree_view_);
   if (!tree_view_->GetSelectedNode())
     return;
   running_menu_for_root_ =
       (tree_model_->GetParent(tree_view_->GetSelectedNode()) ==
        tree_model_->GetRoot());
-  context_menu_.reset(views::Menu::Create(this, views::Menu::TOPLEFT,
-                                          GetWidget()->GetNativeView()));
-  context_menu_->AppendMenuItemWithLabel(IDS_EDIT,
-      l10n_util::GetString(IDS_EDIT));
-  context_menu_->AppendMenuItemWithLabel(
-      IDS_BOOMARK_EDITOR_NEW_FOLDER_MENU_ITEM,
-      l10n_util::GetString(IDS_BOOMARK_EDITOR_NEW_FOLDER_MENU_ITEM));
-  context_menu_->RunMenuAt(x, y);
+  if (!context_menu_contents_.get()) {
+    context_menu_contents_.reset(new views::SimpleMenuModel(this));
+    context_menu_contents_->AddItemWithStringId(IDS_EDIT, IDS_EDIT);
+    context_menu_contents_->AddItemWithStringId(
+        IDS_BOOMARK_EDITOR_NEW_FOLDER_MENU_ITEM,
+        IDS_BOOMARK_EDITOR_NEW_FOLDER_MENU_ITEM);
+    context_menu_.reset(new views::Menu2(context_menu_contents_.get()));
+  }
+  context_menu_->RunContextMenuAt(gfx::Point(x, y));
 }
 
 void BookmarkEditorView::Init() {
   bb_model_ = profile_->GetBookmarkModel();
   DCHECK(bb_model_);
   bb_model_->AddObserver(this);
 
   url_tf_.SetParentOwned(false);
   title_tf_.SetParentOwned(false);
 
@@ skipping 290 matching lines @@
           break;
         }
       }
       DCHECK(child_bb_node);
       bb_model_->SetTitle(child_bb_node, child_b_node->GetTitle());
     }
     ApplyNameChangesAndCreateNewGroups(child_bb_node, child_b_node,
                                        parent_b_node, parent_bb_node);
   }
 }