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;

[dmazzoni, 2011/11/09 14:43:20]

If we do this, add a comment like "One case to deal with is a status bar menu
with an icon for the title and a single item - in that case, use the text of the
item as the title of the menu.

+  if (child_count() == 1 && title_.empty()) {

[sky, 2011/11/09 15:11:37]

This seems weird. Why do we want the accessible title for a folder with no name
to come from the first child?

[dmazzoni, 2011/11/09 15:50:21]

The motivating example is the status bar menus on Chrome OS - for example, the
Battery menu has an icon for the title, and a single disabled item that says
"Battery: 100%". I think it should be made explicit if we want to do this, e.g.:
menu-> UseFirstItemAsAccessibleMenuTitle, otherwise it's brittle (and
confusing).

[hashimoto, 2011/11/10 05:22:51]

I don't know examples other than ChromeOS status area menus , but there is
already code treating the case "child_count() == 1 && title_.empty()" in a
different way.
Added IsFirstChildToTakeOver() to make it clear that this is the special case.

+    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 417 matching lines @@
   if(!MenuConfig::instance().show_accelerators)
     return string16();
 
   Accelerator accelerator;
   return (GetDelegate() &&
           GetDelegate()->GetAccelerator(GetCommand(), &accelerator)) ?
       accelerator.GetShortcutText() : string16();
 }
 
 }  // namespace views