Makes the other bookmark folder menu close if you delete the last item

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

 // Copyright (c) 2011 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_context_menu.h"
 
 #include "base/i18n/rtl.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
+#include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/profiles/profile.h"
 #include "content/common/notification_service.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "views/controls/menu/menu_item_view.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 // BookmarkContextMenu, public:
 
 BookmarkContextMenu::BookmarkContextMenu(
     gfx::NativeWindow parent_window,
     Profile* profile,
     PageNavigator* page_navigator,
     const BookmarkNode* parent,
     const std::vector<const BookmarkNode*>& selection)
     : ALLOW_THIS_IN_INITIALIZER_LIST(
           controller_(new BookmarkContextMenuControllerViews(parent_window,
               this, profile, page_navigator, parent, selection))),
       parent_window_(parent_window),
       ALLOW_THIS_IN_INITIALIZER_LIST(menu_(new views::MenuItemView(this))),
+      parent_node_(parent),
       observer_(NULL) {
   controller_->BuildMenu();
 }
 
 BookmarkContextMenu::~BookmarkContextMenu() {
 }
 
 void BookmarkContextMenu::RunMenuAt(const gfx::Point& point) {
   NotificationService::current()->Notify(
       NotificationType::BOOKMARK_CONTEXT_MENU_SHOWN,
@@ skipping 15 matching lines @@
 
 bool BookmarkContextMenu::IsItemChecked(int command_id) const {
   return controller_->IsItemChecked(command_id);
 }
 
 bool BookmarkContextMenu::IsCommandEnabled(int command_id) const {
   return controller_->IsCommandEnabled(command_id);
 }
 
 bool BookmarkContextMenu::ShouldCloseAllMenusOnExecute(int id) {
-  return id != IDC_BOOKMARK_BAR_REMOVE;
+  return id != IDC_BOOKMARK_BAR_REMOVE ||
+      (parent_node_ ==
+       controller_->profile()->GetBookmarkModel()->other_node() &&
+       parent_node_->child_count() == 1);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // BookmarkContextMenu, BookmarkContextMenuControllerViewsDelegate
 // implementation:
 
 void BookmarkContextMenu::CloseMenu() {
   menu_->Cancel();
 }
 
@@ skipping 15 matching lines @@
 void BookmarkContextMenu::WillRemoveBookmarks(
     const std::vector<const BookmarkNode*>& bookmarks) {
   if (observer_)
     observer_->WillRemoveBookmarks(bookmarks);
 }
 
 void BookmarkContextMenu::DidRemoveBookmarks() {
   if (observer_)
     observer_->DidRemoveBookmarks();
 }