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

Unified Diff: chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc

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
« no previous file with comments | « no previous file | chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
index b8568d1f5674426e95f6be59d10557a3400b4972..4651a2164fdf37fef929e3370710ef548791e974 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
@@ -1510,7 +1510,7 @@ void BookmarkBarView::ShowContextMenuForView(views::View* source,
return;
}
- const BookmarkNode* parent = NULL;
+ const BookmarkNode* parent = nullptr;
std::vector<const BookmarkNode*> nodes;
if (source == other_bookmarks_button_) {
parent = model_->other_node();
@@ -1538,8 +1538,9 @@ void BookmarkBarView::ShowContextMenuForView(views::View* source,
parent = model_->bookmark_bar_node();
nodes.push_back(parent);
}
- bool close_on_remove =
- (parent == model_->other_node()) && (parent->child_count() == 1);
+ // |close_on_remove| only matters for nested menus. We're not nested at this
+ // point, so this value has no effect.
+ const bool close_on_remove = true;
context_menu_.reset(new BookmarkContextMenu(
GetWidget(), browser_, browser_->profile(),
« no previous file with comments | « no previous file | chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698