Make NetworkMenuModel a ui::MenuModel again.

views/controls/menu/menu_model_adapter.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_model_adapter.h"
 
 #include "base/logging.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/menu_model.h"
 #include "views/controls/menu/submenu_view.h"
@@ skipping 14 matching lines @@
 void MenuModelAdapter::BuildMenu(MenuItemView* menu) {
   DCHECK(menu);
 
   // Clear the menu.
   if (menu->HasSubmenu()) {
     const int subitem_count = menu->GetSubmenu()->child_count();
     for (int i = 0; i < subitem_count; ++i)
       menu->RemoveMenuItemAt(0);
   }
 
-  menu_map_.clear();
+  // Leave entries in the map if the menu is being shown.  This
+  // allows the map to find the menu model of submenus being closed
+  // so ui::MenuModel::MenuClosed() can be called.
+  if (!menu->GetMenuController())

[sky, 2011/08/02 15:54:56]

Can you add a test for coverage of this case.

[rhashimoto, 2011/08/02 23:04:07]

Done.

+    menu_map_.clear();
   menu_map_[menu] = menu_model_;
 
   // Repopulate the menu.
   BuildMenuImpl(menu, menu_model_);
   menu->ChildrenChanged();
 }
 
 // MenuModelAdapter, MenuDelegate implementation:
 
 void MenuModelAdapter::ExecuteCommand(int id) {
@@ skipping 138 matching lines @@
       BuildMenuImpl(item, submodel);
 
       menu_map_[item] = submodel;
     }
   }
 
   menu->set_has_icons(model->HasIcons());
 }
 
 }  // namespace views