Index: chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h |
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h |
index e7f27098c2155bdcdd89798f9ce7c2afc991d075..5e3a4144d2dfb09a78dbdc5d206b588779604fef 100644 |
--- a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h |
+++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h |
@@ -81,7 +81,11 @@ class BookmarkMenuDelegate : public bookmarks::BaseBookmarkModelObserver, |
// the first child of |node| to show in the menu. |
void SetActiveMenu(const bookmarks::BookmarkNode* node, int start_index); |
- bookmarks::BookmarkModel* GetBookmarkModel(); |
+ bookmarks::BookmarkModel* GetBookmarkModel() { |
+ return const_cast<bookmarks::BookmarkModel*>( |
+ const_cast<const BookmarkMenuDelegate*>(this)->GetBookmarkModel()); |
+ } |
+ const bookmarks::BookmarkModel* GetBookmarkModel() const; |
bookmarks::ManagedBookmarkService* GetManagedBookmarkService(); |
// Returns the menu. |
@@ -144,6 +148,9 @@ class BookmarkMenuDelegate : public bookmarks::BaseBookmarkModelObserver, |
typedef std::map<const bookmarks::BookmarkNode*, views::MenuItemView*> |
NodeToMenuMap; |
+ // Returns whether the menu should close id 'delete' is selected. |
+ bool ShouldCloseOnRemove(const bookmarks::BookmarkNode* node) const; |
+ |
// Creates a menu. This uses BuildMenu() to recursively populate the menu. |
views::MenuItemView* CreateMenu(const bookmarks::BookmarkNode* parent, |
int start_child_index, |