Fix bug in not exiting menu when choosing 'delete'

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

 // 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.
 
 #include "chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h"
 
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
@@ skipping 99 matching lines @@
     menu_ = CreateMenu(node, start_child_index, show_options);
   }
 }
 
 void BookmarkMenuDelegate::SetPageNavigator(PageNavigator* navigator) {
   page_navigator_ = navigator;
   if (context_menu_.get())
     context_menu_->SetPageNavigator(navigator);
 }
 
-BookmarkModel* BookmarkMenuDelegate::GetBookmarkModel() {
+const BookmarkModel* BookmarkMenuDelegate::GetBookmarkModel() const {
   return BookmarkModelFactory::GetForProfile(profile_);
 }
 
 bookmarks::ManagedBookmarkService*
 BookmarkMenuDelegate::GetManagedBookmarkService() {
   return ManagedBookmarkServiceFactory::GetForProfile(profile_);
 }
 
 void BookmarkMenuDelegate::SetActiveMenu(const BookmarkNode* node,
                                          int start_index) {
@@ skipping 175 matching lines @@
   bool copy = event.source_operations() == ui::DragDropTypes::DRAG_COPY;
   return chrome::DropBookmarks(profile_, drop_data_,
                                drop_parent, index_to_drop_at, copy);
 }
 
 bool BookmarkMenuDelegate::ShowContextMenu(MenuItemView* source,
                                            int id,
                                            const gfx::Point& p,
                                            ui::MenuSourceType source_type) {
   DCHECK(menu_id_to_node_map_.find(id) != menu_id_to_node_map_.end());
-  std::vector<const BookmarkNode*> nodes;
-  nodes.push_back(menu_id_to_node_map_[id]);
-  bool close_on_delete = !parent_menu_item_ &&
-      (nodes[0]->parent() == GetBookmarkModel()->other_node() &&
-       nodes[0]->parent()->child_count() == 1);
-  context_menu_.reset(
-      new BookmarkContextMenu(
-          parent_,
-          browser_,
-          profile_,
-          page_navigator_,
-          nodes[0]->parent(),
-          nodes,
-          close_on_delete));
+  const BookmarkNode* node = menu_id_to_node_map_[id];
+  std::vector<const BookmarkNode*> nodes(1, node);
+  context_menu_.reset(new BookmarkContextMenu(
+      parent_, browser_, profile_, page_navigator_, node->parent(), nodes,
+      ShouldCloseOnRemove(node)));
   context_menu_->set_observer(this);
   context_menu_->RunMenuAt(p, source_type);
-  context_menu_.reset(NULL);
+  context_menu_.reset(nullptr);
   return true;
 }
 
 bool BookmarkMenuDelegate::CanDrag(MenuItemView* menu) {
   const BookmarkNode* node = menu_id_to_node_map_[menu->GetCommand()];
   // Don't let users drag the other folder.
   return node->parent() != GetBookmarkModel()->root_node();
 }
 
 void BookmarkMenuDelegate::WriteDragData(MenuItemView* sender,
@@ skipping 93 matching lines @@
     (*i)->ChildrenChanged();
 }
 
 void BookmarkMenuDelegate::DidRemoveBookmarks() {
   // Balances remove in WillRemoveBookmarksImpl.
   GetBookmarkModel()->AddObserver(this);
   DCHECK(is_mutating_model_);
   is_mutating_model_ = false;
 }
 
+bool BookmarkMenuDelegate::ShouldCloseOnRemove(const BookmarkNode* node) const {
+  // We never need to close when embedded in the app menu.
+  const bool is_shown_from_app_menu = parent_menu_item_ != nullptr;
+  if (is_shown_from_app_menu)
+    return false;
+
+  const bool is_only_child_of_other_folder =
+      (node->parent() == GetBookmarkModel()->other_node() &&
+       node->parent()->child_count() == 1);
+  const bool is_child_of_bookmark_bar =
+      node->parent() == GetBookmarkModel()->bookmark_bar_node();
+  // The 'other' bookmarks folder hides when it has no more items, so we need
+  // to exit the menu when the last node is removed.
+  // If the parent is the bookmark bar, then the menu is showing for an item on
+  // the bookmark bar. When removing this item we need to close the menu (as
+  // there is no longer anything to anchor the menu to).
+  return is_only_child_of_other_folder || is_child_of_bookmark_bar;
+}
+
 MenuItemView* BookmarkMenuDelegate::CreateMenu(const BookmarkNode* parent,
                                                int start_child_index,
                                                ShowOptions show_options) {
   MenuItemView* menu = new MenuItemView(real_delegate_);
   menu->SetCommand(next_menu_id_++);
   AddMenuToMaps(menu, parent);
   menu->set_has_icons(true);
   bool show_permanent = show_options == SHOW_PERMANENT_FOLDERS;
   if (show_permanent && parent == GetBookmarkModel()->bookmark_bar_node()) {
     BuildMenuForManagedNode(menu);
@@ skipping 75 matching lines @@
     }
     AddMenuToMaps(child_menu_item, node);
   }
 }
 
 void BookmarkMenuDelegate::AddMenuToMaps(MenuItemView* menu,
                                          const BookmarkNode* node) {
   menu_id_to_node_map_[menu->GetCommand()] = node;
   node_to_menu_map_[node] = menu;
 }