Fix bug in not exiting menu when choosing 'delete'

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

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..1d1465672d56b19c4c12a63b801290d096cb020a 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,10 @@ class BookmarkMenuDelegate : public bookmarks::BaseBookmarkModelObserver,
   typedef std::map<const bookmarks::BookmarkNode*, views::MenuItemView*>
       NodeToMenuMap;
 
+  // Returns the value to supply to creation of BookmarkContextMenu for

[Devlin, 2015/12/29 19:30:04]

nit: I think it'd be clearer to describe the meaning of the value (i.e., whether
or not all active menus should be closed if 'remove' is selected) rather than
specifying a ctor parameter that it matches up to.  That said, the comments +
method name make it sufficiently obvious that I don't feel too strongly.

[sky, 2015/12/29 19:38:43]

Done.

+  // |close_on_remove|.
+  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,