Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(12)

Unified Diff: trunk/src/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h

Issue 26546004: Revert 227675 "reland "views: change WrenchMenu to use each mode..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: trunk/src/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h
===================================================================
--- trunk/src/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h (revision 227696)
+++ trunk/src/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h (working copy)
@@ -53,8 +53,7 @@
BookmarkMenuDelegate(Browser* browser,
content::PageNavigator* navigator,
views::Widget* parent,
- int first_menu_id,
- int max_menu_id);
+ int first_menu_id);
virtual ~BookmarkMenuDelegate();
// Creates the menus from the model.
@@ -130,9 +129,6 @@
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;
@@ -162,10 +158,6 @@
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_;
@@ -198,10 +190,6 @@
// ID of the next menu item.
int next_menu_id_;
- // Minimum and maximum ID's to use for menu items.
- const int min_menu_id_;
- const int max_menu_id_;
-
views::MenuDelegate* real_delegate_;
// Is the model being changed?

Powered by Google App Engine
This is Rietveld 408576698