Replace ButtonDropDown menu implementation (Menu2) with MenuItemView.

views/controls/menu/menu_item_view.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_item_view.h"
 
 #include "base/i18n/case_conversion.h"
 #include "base/stl_util-inl.h"
 #include "base/utf_string_conversions.h"
 #include "grit/app_strings.h"
@@ skipping 18 matching lines @@
 
 // EmptyMenuMenuItem ---------------------------------------------------------
 
 // EmptyMenuMenuItem is used when a menu has no menu items. EmptyMenuMenuItem
 // is itself a MenuItemView, but it uses a different ID so that it isn't
 // identified as a MenuItemView.
 
 class EmptyMenuMenuItem : public MenuItemView {
  public:
   explicit EmptyMenuMenuItem(MenuItemView* parent)
-      : MenuItemView(parent, 0, NORMAL) {
+      : MenuItemView(parent, 0, EMPTY) {
     // Set this so that we're not identified as a normal menu item.
     SetID(kEmptyMenuItemViewID);
     SetTitle(UTF16ToWide(
         l10n_util::GetStringUTF16(IDS_APP_MENU_EMPTY_SUBMENU)));
     SetEnabled(false);
   }
 
   virtual bool GetTooltipText(const gfx::Point& p, std::wstring* tooltip) {
     // Empty menu items shouldn't have a tooltip.
     return false;
@@ skipping 79 matching lines @@
     case SUBMENU:
       state->state |= ui::AccessibilityTypes::STATE_HASPOPUP;
       break;
     case CHECKBOX:
     case RADIO:
       state->state |= GetDelegate()->IsItemChecked(GetCommand()) ?
           ui::AccessibilityTypes::STATE_CHECKED : 0;
       break;
     case NORMAL:
     case SEPARATOR:
+    case EMPTY:
       // No additional accessibility states currently for these menu states.
       break;
   }
 }
 
 // static
 string16 MenuItemView::GetAccessibleNameForMenuItem(
       const string16& item_text, const string16& accelerator_text) {
   string16 accessible_name = item_text;
 
@@ skipping 104 matching lines @@
     canceled_ = true;
     controller_->Cancel(MenuController::EXIT_ALL);
   }
 }
 
 MenuItemView* MenuItemView::AddMenuItemAt(int index,
                                           int item_id,
                                           const std::wstring& label,
                                           const SkBitmap& icon,
                                           Type type) {
+  DCHECK_NE(type, EMPTY);
   DCHECK_LE(0, index);
   if (!submenu_)
     CreateSubmenu();
   DCHECK_GE(submenu_->child_count(), index);
   if (type == SEPARATOR) {
     submenu_->AddChildViewAt(new MenuSeparator(), index);
     return NULL;
   }
   MenuItemView* item = new MenuItemView(this, item_id, type);
   if (label.empty() && GetDelegate())
@@ skipping 283 matching lines @@
   type_ = type;
   selected_ = false;
   command_ = command;
   submenu_ = NULL;
   show_mnemonics_ = false;
   // Assign our ID, this allows SubmenuItemView to find MenuItemViews.
   SetID(kMenuItemViewID);
   has_icons_ = false;
 
   // Don't request enabled status from the root menu item as it is just
-  // a container for real items.
+  // a container for real items.  EMPTY items will be disabled.
   MenuDelegate* root_delegate = GetDelegate();
-  if (parent && root_delegate)
+  if (parent && type != EMPTY && root_delegate)
     SetEnabled(root_delegate->IsCommandEnabled(command));
 }
 
 void MenuItemView::DropMenuClosed(bool notify_delegate) {
   DCHECK(controller_);
   DCHECK(!controller_->IsBlockingRun());
   if (MenuController::GetActiveInstance() == controller_)
     MenuController::SetActiveInstance(NULL);
   delete controller_;
   controller_ = NULL;
@@ skipping 166 matching lines @@
     return string16();
   }
 
   Accelerator accelerator;
   return (GetDelegate() &&
           GetDelegate()->GetAccelerator(GetCommand(), &accelerator)) ?
       accelerator.GetShortcutText() : string16();
 }
 
 }  // namespace views