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

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

Issue 1550173002: Fix bug in not exiting menu when choosing 'delete' (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: feedback Created 5 years 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: 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,
« no previous file with comments | « chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc ('k') | chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698