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.h

 // 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.
 
 #ifndef VIEWS_CONTROLS_MENU_MENU_ITEM_VIEW_H_
 #define VIEWS_CONTROLS_MENU_MENU_ITEM_VIEW_H_
 #pragma once
 
 #include <string>
 #include <vector>
@@ skipping 375 matching lines @@
 
   // Used by MenuController to cache the menu position in use by the
   // active menu.
   MenuPosition actual_menu_position() const { return actual_menu_position_; }
   void set_actual_menu_position(MenuPosition actual_menu_position) {
     actual_menu_position_ = actual_menu_position;
   }
 
   void set_controller(MenuController* controller) { controller_ = controller; }
 
+  // Returns true when |this| itself has no content and the first child is
+  // responsible to show content.

[dmazzoni, 2011/11/10 06:30:49]

responsible to show content -> responsible for showing content

[hashimoto, 2011/11/10 07:24:23]

Done.

+  // (i.e. when the label is empty and there is only one child.)
+  bool IsFirstChildToTakeOver() const;
+
   // The delegate. This is only valid for the root menu item. You shouldn't
   // use this directly, instead use GetDelegate() which walks the tree as
   // as necessary.
   MenuDelegate* delegate_;
 
   // The controller for the run operation, or NULL if the menu isn't showing.
   MenuController* controller_;
 
   // Used to detect when Cancel was invoked.
   bool canceled_;
@@ skipping 10 matching lines @@
 
   // Command id.
   int command_;
 
   // Submenu, created via CreateSubmenu.
   SubmenuView* submenu_;
 
   // Title.
   string16 title_;
 
-  // Accessible name (doesn't include accelerators, etc.).
-  string16 accessible_name_;
-
   // Icon.
   SkBitmap icon_;
 
   // Does the title have a mnemonic? Only useful on the root menu item.
   bool has_mnemonics_;
 
   // Should we show the mnemonic? Mnemonics are shown if this is true or
   // MenuConfig says mnemonics should be shown. Only used on the root menu item.
   bool show_mnemonics_;
 
@@ skipping 27 matching lines @@
   // position of the menu being shown.
   MenuPosition requested_menu_position_;
   MenuPosition actual_menu_position_;
 
   DISALLOW_COPY_AND_ASSIGN(MenuItemView);
 };
 
 }  // namespace views
 
 #endif  // VIEWS_CONTROLS_MENU_MENU_ITEM_VIEW_H_