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

chrome/browser/views/bookmark_editor_view.h

 // Copyright (c) 2009 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.
 
 #ifndef CHROME_BROWSER_VIEWS_BOOKMARK_EDITOR_VIEW_H_
 #define CHROME_BROWSER_VIEWS_BOOKMARK_EDITOR_VIEW_H_
 
 #include <set>
 
 #include "app/tree_node_model.h"
 #include "chrome/browser/bookmarks/bookmark_editor.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "views/controls/button/button.h"
-#include "views/controls/menu/menu.h"
+#include "views/controls/menu/simple_menu_model.h"
 #include "views/controls/textfield/textfield.h"
 #include "views/controls/tree/tree_view.h"
 #include "views/window/dialog_delegate.h"
 
 namespace views {
 class NativeButton;
 class Window;
 }
 
 class GURL;
 class Menu;
 class Profile;
 
 // View that allows the user to edit a bookmark/starred URL. The user can
 // change the URL, title and where the bookmark appears as well as adding
 // new groups and changing the name of other groups.
 //
 // Edits are applied to the BookmarkModel when the user presses 'OK'.
 //
 // To use BookmarkEditorView invoke the static show method.
 
 class BookmarkEditorView : public BookmarkEditor,
                            public views::View,
                            public views::ButtonListener,
                            public views::TreeViewController,
                            public views::DialogDelegate,
                            public views::Textfield::Controller,
                            public views::ContextMenuController,
-                           public views::Menu::Delegate,
+                           public views::SimpleMenuModel::Delegate,
                            public BookmarkModelObserver {
   FRIEND_TEST(BookmarkEditorViewTest, ChangeParent);
   FRIEND_TEST(BookmarkEditorViewTest, ChangeParentAndURL);
   FRIEND_TEST(BookmarkEditorViewTest, ChangeURLToExistingURL);
   FRIEND_TEST(BookmarkEditorViewTest, EditTitleKeepsPosition);
   FRIEND_TEST(BookmarkEditorViewTest, EditURLKeepsPosition);
   FRIEND_TEST(BookmarkEditorViewTest, ModelsMatch);
   FRIEND_TEST(BookmarkEditorViewTest, MoveToNewParent);
   FRIEND_TEST(BookmarkEditorViewTest, NewURL);
   FRIEND_TEST(BookmarkEditorViewTest, ChangeURLNoTree);
@@ skipping 30 matching lines @@
   virtual void ContentsChanged(views::Textfield* sender,
                                const std::wstring& new_contents);
   virtual bool HandleKeystroke(views::Textfield* sender,
                                const views::Textfield::Keystroke&) {
     return false;
   }
 
   // NativeButton.
   virtual void ButtonPressed(views::Button* sender);
 
-  // Menu::Delegate method.
-  virtual void ExecuteCommand(int id);
-
-  // Menu::Delegate method, return false if id is edit and the bookmark node
-  // was selected, true otherwise.
-  virtual bool IsCommandEnabled(int id) const;
+  // SimpleMenuModel::Delegate.
+  virtual bool IsCommandIdChecked(int command_id) const;
+  virtual bool IsCommandIdEnabled(int command_id) const;
+  virtual bool GetAcceleratorForCommandId(int command_id,
+                                          views::Accelerator* accelerator);
+  virtual void ExecuteCommand(int command_id);
 
   // Creates a Window and adds the BookmarkEditorView to it. When the window is
   // closed the BookmarkEditorView is deleted.
   void Show(HWND parent_hwnd);
 
   // Closes the dialog.
   void Close();
 
   // Shows the context menu.
   virtual void ShowContextMenu(View* source,
@@ skipping 127 matching lines @@
   // Used for editing the title.
   views::Textfield title_tf_;
 
   // Initial parent to select. Is only used if node_ is NULL.
   BookmarkNode* parent_;
 
   // Node being edited. Is NULL if creating a new node.
   BookmarkNode* node_;
 
   // The context menu.
-  scoped_ptr<views::Menu> context_menu_;
+  scoped_ptr<views::SimpleMenuModel> context_menu_contents_;
+  scoped_ptr<views::Menu2> context_menu_;
 
   // Mode used to create nodes from.
   BookmarkModel* bb_model_;
 
   // If true, we're running the menu for the bookmark bar or other bookmarks
   // nodes.
   bool running_menu_for_root_;
 
   // Is the tree shown?
   bool show_tree_;
 
   scoped_ptr<BookmarkEditor::Handler> handler_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkEditorView);
 };
 
 #endif  // CHROME_BROWSER_VIEWS_BOOKMARK_EDITOR_VIEW_H_