Add MenuItemView API to add and remove items at a particular index.

views/controls/menu/menu_controller.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 "views/controls/menu/menu_controller.h"
 
 #include "base/i18n/case_conversion.h"
 #include "base/i18n/rtl.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
@@ skipping 1324 matching lines @@
   showing_submenu_ = true;
   if (show)
     item->GetSubmenu()->ShowAt(owner_, bounds, do_capture);
   else
     item->GetSubmenu()->Reposition(bounds);
   showing_submenu_ = false;
 }
 
 void MenuController::MenuChildrenChanged(MenuItemView* item) {
   DCHECK(item);
-  DCHECK(item->GetSubmenu()->IsShowing());
 
-  // Currently this only supports adjusting the bounds of the last menu.
-  DCHECK(item == state_.item->GetParentMenuItem());
+  // If the current item or pending item is a descendant of the item
+  // that changed, move the selection back to the changed item.
+  const MenuItemView* ancestor = state_.item;
+  while (ancestor && ancestor != item)
+    ancestor = ancestor->GetParentMenuItem();
+  ancestor = ancestor ? ancestor : pending_state_.item;
+  while (ancestor && ancestor != item)
+    ancestor = ancestor->GetParentMenuItem();
 
-  // Make sure the submenu isn't showing for the current item (the position may
-  // have changed or the menu removed). This also moves the selection back to
-  // the parent, which handles the case where the selected item was removed.
-  SetSelection(state_.item->GetParentMenuItem(),
-               SELECTION_OPEN_SUBMENU | SELECTION_UPDATE_IMMEDIATELY);
-
-  OpenMenuImpl(item, false);
+  if (ancestor) {
+    SetSelection(item, SELECTION_OPEN_SUBMENU | SELECTION_UPDATE_IMMEDIATELY);
+    if (item->HasSubmenu())
+      OpenMenuImpl(item, false);
+  }
 }
 
 void MenuController::BuildPathsAndCalculateDiff(
     MenuItemView* old_item,
     MenuItemView* new_item,
     std::vector<MenuItemView*>* old_path,
     std::vector<MenuItemView*>* new_path,
     size_t* first_diff_at) {
   DCHECK(old_path && new_path && first_diff_at);
   BuildMenuItemPath(old_item, old_path);
@@ skipping 490 matching lines @@
     return;
 
   // Reset the active_mouse_view_ before sending mouse capture lost. That way if
   // it calls back to us, we aren't in a weird state.
   View* active_view = active_mouse_view_;
   active_mouse_view_ = NULL;
   active_view->OnMouseCaptureLost();
 }
 
 }  // namespace views