Replace ButtonDropDown menu implementation (Menu2) with MenuItemView.

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 76 matching lines @@
 }
 
 const gfx::Font& MenuModelAdapter::GetLabelFont(int id) const {
   ui::MenuModel* model = menu_model_;
   int index = 0;
   if (ui::MenuModel::GetModelAndIndexForCommandId(id, &model, &index)) {
     const gfx::Font* font = model->GetLabelFontAt(index);
     return font ? *font : MenuDelegate::GetLabelFont(id);
   }
 
-  NOTREACHED();
+  // This line may be reached for the empty menu item.
   return MenuDelegate::GetLabelFont(id);
 }
 
 bool MenuModelAdapter::IsCommandEnabled(int id) const {
   ui::MenuModel* model = menu_model_;
   int index = 0;
   if (ui::MenuModel::GetModelAndIndexForCommandId(id, &model, &index))
     return model->IsEnabledAt(index);
 
   NOTREACHED();
   return false;
 }
 
 bool MenuModelAdapter::IsItemChecked(int id) const {
   ui::MenuModel* model = menu_model_;
   int index = 0;
   if (ui::MenuModel::GetModelAndIndexForCommandId(id, &model, &index))
     return model->IsItemCheckedAt(index);
 
   NOTREACHED();
   return false;
 }
 
 void MenuModelAdapter::SelectionChanged(MenuItemView* menu) {
+  // Ignore selection of the root menu.
+  if (menu == menu->GetRootMenuItem())
+    return;
+
   const int id = menu->GetCommand();
   ui::MenuModel* model = menu_model_;
   int index = 0;
   if (ui::MenuModel::GetModelAndIndexForCommandId(id, &model, &index)) {
     model->HighlightChangedTo(index);
     return;
   }
 
   NOTREACHED();
 }
 
 void MenuModelAdapter::WillShowMenu(MenuItemView* menu) {
   // Look up the menu model for this menu.
   const std::map<MenuItemView*, ui::MenuModel*>::const_iterator map_iterator =
       menu_map_.find(menu);
   if (map_iterator != menu_map_.end()) {
     map_iterator->second->MenuWillShow();
     return;
   }
 
   NOTREACHED();
 }
 
+void MenuModelAdapter::WillHideMenu(MenuItemView* menu) {
+  // Look up the menu model for this menu.
+  const std::map<MenuItemView*, ui::MenuModel*>::const_iterator map_iterator =
+      menu_map_.find(menu);
+  if (map_iterator != menu_map_.end()) {
+    map_iterator->second->MenuClosed();
+    return;
+  }
+
+  NOTREACHED();
+}
+
 // MenuModelAdapter, private:
 
 void MenuModelAdapter::BuildMenuImpl(MenuItemView* menu, ui::MenuModel* model) {
   DCHECK(menu);
   DCHECK(model);
   const int item_count = model->GetItemCount();
   for (int i = 0; i < item_count; ++i) {
     const int index = i + model->GetFirstItemIndex(NULL);
     MenuItemView* item = menu->AppendMenuItemFromModel(
         model, index, model->GetCommandIdAt(index));
 
     if (model->GetTypeAt(index) == ui::MenuModel::TYPE_SUBMENU) {
       DCHECK(item);
       DCHECK_EQ(MenuItemView::SUBMENU, item->GetType());
       ui::MenuModel* submodel = model->GetSubmenuModelAt(index);
       DCHECK(submodel);
       BuildMenuImpl(item, submodel);
 
       menu_map_[item] = submodel;
     }
   }
 
   menu->set_has_icons(model->HasIcons());
 }
 
 }  // views