Fix bug in not exiting menu when choosing 'delete'

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

 // 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_MENU_DELEGATE_H_
 #define CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_MENU_DELEGATE_H_
 
 #include <map>
 #include <set>
 
@@ skipping 63 matching lines @@
   // Sets the PageNavigator.
   void SetPageNavigator(content::PageNavigator* navigator);
 
   // Returns the id given to the next menu.
   int next_menu_id() const { return next_menu_id_; }
 
   // Makes the menu for |node| the active menu. |start_index| is the index of
   // 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.
   views::MenuItemView* menu() { return menu_; }
 
   // Returns the context menu, or NULL if the context menu isn't showing.
   views::MenuItemView* context_menu() {
     return context_menu_.get() ? context_menu_->menu() : NULL;
   }
 
@@ skipping 42 matching lines @@
       const std::vector<const bookmarks::BookmarkNode*>& bookmarks) override;
   void DidRemoveBookmarks() override;
 
  private:
   friend class BookmarkMenuDelegateTest;
 
   typedef std::map<int, const bookmarks::BookmarkNode*> MenuIDToNodeMap;
   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,
                                   ShowOptions show_options);
 
   // Invokes BuildMenuForPermanentNode() for the permanent nodes (excluding
   // 'other bookmarks' folder).
   void BuildMenusForPermanentNodes(views::MenuItemView* menu);
 
   // If |node| has children a new menu is created and added to |menu| to
@@ skipping 52 matching lines @@
   // Is the model being changed?
   bool is_mutating_model_;
 
   // The location where this bookmark menu will be displayed (for UMA).
   BookmarkLaunchLocation location_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkMenuDelegate);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_MENU_DELEGATE_H_