OLD: reland "views: change WrenchMenu to use each model's command ID's when creating MenuItemView's"

chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_MENU_DELEGATE_H_
 #define CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_MENU_DELEGATE_H_
 
 #include <map>
 #include <set>
 
@@ skipping 35 matching lines @@
     // contents of the bookmark bar folder.
     SHOW_PERMANENT_FOLDERS,
 
     // Don't show any additional folders.
     HIDE_PERMANENT_FOLDERS
   };
 
   BookmarkMenuDelegate(Browser* browser,
                        content::PageNavigator* navigator,
                        views::Widget* parent,
-                       int first_menu_id);
+                       int first_menu_id,
+                       int max_menu_id);
   virtual ~BookmarkMenuDelegate();
 
   // Creates the menus from the model.
   void Init(views::MenuDelegate* real_delegate,
             views::MenuItemView* parent,
             const BookmarkNode* node,
             int start_child_index,
             ShowOptions show_options,
             BookmarkLaunchLocation location);
 
@@ skipping 55 matching lines @@
   virtual void BookmarkModelChanged() OVERRIDE;
   virtual void BookmarkNodeFaviconChanged(BookmarkModel* model,
                                           const BookmarkNode* node) OVERRIDE;
 
   // BookmarkContextMenu::Observer methods.
   virtual void WillRemoveBookmarks(
       const std::vector<const BookmarkNode*>& bookmarks) OVERRIDE;
   virtual void DidRemoveBookmarks() OVERRIDE;
 
  private:
+  friend class BookmarkMenuDelegateTest;
+  FRIEND_TEST_ALL_PREFIXES(BookmarkMenuDelegateTest, MenuIdRange);
+
   typedef std::map<int, const BookmarkNode*> MenuIDToNodeMap;
   typedef std::map<const BookmarkNode*, views::MenuItemView*> NodeToMenuMap;
 
   // Creates a menu. This uses BuildMenu() to recursively populate the menu.
   views::MenuItemView* CreateMenu(const BookmarkNode* parent,
                                   int start_child_index,
                                   ShowOptions show_options);
 
   // Invokes BuildMenuForPermanentNode() for the permanent nodes (excluding
   // 'other bookmarks' folder).
   void BuildMenusForPermanentNodes(views::MenuItemView* menu,
                                    int* next_menu_id);
 
   // If |node| has children a new menu is created and added to |menu| to
   // represent it. If |node| is not empty and |added_separator| is false, a
   // separator is added before the new menu items and |added_separator| is set
   // to true.
   void BuildMenuForPermanentNode(const BookmarkNode* node,
                                  views::MenuItemView* menu,
                                  int* next_menu_id,
                                  bool* added_separator);
 
   // Creates an entry in menu for each child node of |parent| starting at
   // |start_child_index|.
   void BuildMenu(const BookmarkNode* parent,
                  int start_child_index,
                  views::MenuItemView* menu,
                  int* next_menu_id);
 
+  // Returns true if |menu_id_| is outside the range of minimum and maximum menu
+  // ID's allowed.
+  bool IsOutsideMenuIdRange(int menu_id) const;
+
   Browser* browser_;
   Profile* profile_;
 
   content::PageNavigator* page_navigator_;
 
   // Parent of menus.
   views::Widget* parent_;
 
   // Maps from menu id to BookmarkNode.
   MenuIDToNodeMap menu_id_to_node_map_;
@@ skipping 12 matching lines @@
 
   // If non-NULL this is the |parent| passed to Init and is NOT owned by us.
   views::MenuItemView* parent_menu_item_;
 
   // Maps from node to menu.
   NodeToMenuMap node_to_menu_map_;
 
   // ID of the next menu item.
   int next_menu_id_;
 
+  // Minimum and maximum ID's to use for menu items.
+  int min_menu_id_;

[sky, 2013/10/08 15:55:04]

Make both of these (min/max) const.

+  int max_menu_id_;
+
   views::MenuDelegate* real_delegate_;
 
   // Is the model being changed?
   bool is_mutating_model_;
 
   // The location where this bookmark menu will be displayed (for UMA).
   BookmarkLaunchLocation location_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkMenuDelegate);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_MENU_DELEGATE_H_