Fix to correctly set accessible name of menu item when there is only one child and title is empty

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.h"
 #include "base/utf_string_conversions.h"
 #include "grit/ui_strings.h"
@@ skipping 121 matching lines @@
   const MenuDelegate* delegate = GetDelegate();
   CHECK(delegate);
   gfx::Point location(p);
   ConvertPointToScreen(this, &location);
   *tooltip = delegate->GetTooltipText(command_, location);
   return !tooltip->empty();
 }
 
 void MenuItemView::GetAccessibleState(ui::AccessibleViewState* state) {
   state->role = ui::AccessibilityTypes::ROLE_MENUITEM;
-  state->name = accessible_name_;
+
+  string16 item_text;
+  if (IsContainer()) {
+    // The first child is taking over, just use its accessible name instead of
+    // |title_|.
+    View* child = child_at(0);
+    ui::AccessibleViewState state;
+    child->GetAccessibleState(&state);
+    item_text = state.name;
+  } else {
+    item_text = title_;
+  }
+  state->name = GetAccessibleNameForMenuItem(item_text, GetAcceleratorText());
+
   switch (GetType()) {
     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:
@@ skipping 170 matching lines @@
 bool MenuItemView::HasSubmenu() const {
   return (submenu_ != NULL);
 }
 
 SubmenuView* MenuItemView::GetSubmenu() const {
   return submenu_;
 }
 
 void MenuItemView::SetTitle(const string16& title) {
   title_ = title;
-  accessible_name_ = GetAccessibleNameForMenuItem(title_, GetAcceleratorText());
   pref_size_.SetSize(0, 0);  // Triggers preferred size recalculation.
 }
 
 void MenuItemView::SetSelected(bool selected) {
   selected_ = selected;
   SchedulePaint();
 }
 
 void MenuItemView::SetTooltip(const string16& tooltip, int item_id) {
   MenuItemView* item = GetMenuItemByID(item_id);
@@ skipping 110 matching lines @@
     }
   }
 
   STLDeleteElements(&removed_items_);
 }
 
 void MenuItemView::Layout() {
   if (!has_children())
     return;
 
-  if (child_count() == 1 && title_.empty()) {
-    // We only have one child and no title so let the view take over all the
-    // space.
+  if (IsContainer()) {
     View* child = child_at(0);
     gfx::Size size = child->GetPreferredSize();
     child->SetBounds(0, GetTopMargin(), size.width(), size.height());
   } else {
     // Child views are laid out right aligned and given the full height. To
     // right align start with the last view and progress to the first.
     for (int i = child_count() - 1, x = width() - item_right_margin_; i >= 0;
          --i) {
       View* child = child_at(i);
       int width = child->GetPreferredSize().width();
@@ skipping 231 matching lines @@
   MenuItemView* root = GetRootMenuItem();
   return root && root->has_icons_
       ? MenuConfig::instance().item_bottom_margin :
         MenuConfig::instance().item_no_icon_bottom_margin;
 }
 
 gfx::Size MenuItemView::GetChildPreferredSize() {
   if (!has_children())
     return gfx::Size();
 
-  if (title_.empty() && child_count() == 1) {
+  if (IsContainer()) {
     View* child = child_at(0);
     return child->GetPreferredSize();
   }
 
   int width = 0;
   for (int i = 0; i < child_count(); ++i) {
     if (i)
       width += kChildXPadding;
     width += child_at(i)->GetPreferredSize().width();
   }
   // Return a height of 0 to indicate that we should use the title height
   // instead.
   return gfx::Size(width, 0);
 }
 
 gfx::Size MenuItemView::CalculatePreferredSize() {
   gfx::Size child_size = GetChildPreferredSize();
-  if (child_count() == 1 && title_.empty()) {
+  if (IsContainer()) {
     return gfx::Size(
         child_size.width(),
         child_size.height() + GetBottomMargin() + GetTopMargin());
   }
 
   const gfx::Font& font = GetFont();
 #if defined(TOUCH_UI)
   int height = std::max(font.GetHeight(), kMinItemHeightTouch);
 #else
   int height = font.GetHeight();
@@ skipping 13 matching lines @@
 
   if(!MenuConfig::instance().show_accelerators)
     return string16();
 
   Accelerator accelerator;
   return (GetDelegate() &&
           GetDelegate()->GetAccelerator(GetCommand(), &accelerator)) ?
       accelerator.GetShortcutText() : string16();
 }
 
+bool MenuItemView::IsContainer() const {
+  // Let the first child take over |this| when we only have one child and no
+  // title.  Note that what child_count() returns is the number of children,
+  // not the number of menu items.
+  return child_count() == 1 && title_.empty();
+}
+
 }  // namespace views