Fix accessibility of buttons inside Chrome menu

chrome/browser/ui/views/toolbar/app_menu.cc

 // Copyright 2013 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 "chrome/browser/ui/views/toolbar/app_menu.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 #include <cmath>
@@ skipping 26 matching lines @@
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/common/feature_switch.h"
 #include "grit/theme_resources.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkPaint.h"
+#include "ui/accessibility/ax_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/layout.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/font_list.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia_source.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/gfx/text_utils.h"
@@ skipping 58 matching lines @@
   // Overridden from ImageButton.
   gfx::Size GetPreferredSize() const override {
     gfx::Size pref = ImageButton::GetPreferredSize();
     if (border()) {
       gfx::Insets insets = border()->GetInsets();
       pref.Enlarge(insets.width(), insets.height());
     }
     return pref;
   }
 
+  void GetAccessibleState(ui::AXViewState* state) override {
+    ImageButton::GetAccessibleState(state);
+    state->role = ui::AX_ROLE_MENU_ITEM;
+  }
+
  private:
   DISALLOW_COPY_AND_ASSIGN(FullscreenButton);
 };
 
 // Combination border/background for the buttons contained in the menu. The
 // painting of the border/background is done here as LabelButton does not always
 // paint the border.
 class InMenuButtonBackground : public views::Background {
  public:
   enum ButtonType {
@@ skipping 157 matching lines @@
     set_background(in_menu_background_);
     SetBorder(views::Border::CreateEmptyBorder(0, kHorizontalPadding, 0,
                                                kHorizontalPadding));
     SetFontList(MenuConfig::instance().font_list);
   }
 
   void SetOtherButtons(const InMenuButton* left, const InMenuButton* right) {
     in_menu_background_->SetOtherButtons(left, right);
   }
 
+  void GetAccessibleState(ui::AXViewState* state) override {
+    LabelButton::GetAccessibleState(state);
+    state->role = ui::AX_ROLE_MENU_ITEM;
+  }
+
   // views::LabelButton
   void OnNativeThemeChanged(const ui::NativeTheme* theme) override {
     if (theme) {
       SetTextColor(
           views::Button::STATE_DISABLED,
           theme->GetSystemColor(
               ui::NativeTheme::kColorId_DisabledMenuItemForegroundColor));
       SetTextColor(
           views::Button::STATE_HOVERED,
           theme->GetSystemColor(
@@ skipping 977 matching lines @@
                                 0,
                                 BookmarkMenuDelegate::SHOW_PERMANENT_FOLDERS,
                                 BOOKMARK_LAUNCH_LOCATION_APP_MENU);
 }
 
 int AppMenu::ModelIndexFromCommandId(int command_id) const {
   CommandIDToEntry::const_iterator ix = command_id_to_entry_.find(command_id);
   DCHECK(ix != command_id_to_entry_.end());
   return ix->second.second;
 }