[Switch Access] Improve MenuBubbleController

In bringing Switch Access up to the visual specification, the menu is
being rewritten directly in views/.

This change adds the remaining buttons that may appear in the menu, as
well as adding the ability to specify which buttons are displayed and
firing an event when the button is pressed.

This code is not yet used by the feature; it will be fully incorporated
in a follow-up change.

Relnotes: N/A
Bug: 973719
Change-Id: Ibc3c820b2ad791ee8107ce86da75ba52471e71ae
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2151826
Commit-Queue: Anastasia Helfinstein <anastasi@google.com>
Reviewed-by: Mitsuru Oshima <oshima@chromium.org>
Reviewed-by: David Tseng <dtseng@chromium.org>
Auto-Submit: Anastasia Helfinstein <anastasi@google.com>
Cr-Commit-Position: refs/heads/master@{#762077}

ash/ash_strings.grd

@@ -679,9 +679,30 @@ This file contains the strings for ash.
       <message name="IDS_ASH_SWITCH_ACCESS_BACK_BUTTON_DESCRIPTION" desc="The tooltip text for the Switch Access back button. The back button allows users to exit the feature's current focus area.">
         Back button
       </message>
+      <message name="IDS_ASH_SWITCH_ACCESS_DECREMENT" desc="The label for the Switch Access menu option to decrement the selected input.">
+        Decrement
+      </message>
+      <message name="IDS_ASH_SWITCH_ACCESS_DICTATION" desc="The label for the Switch Access menu option to dictate into the focused input.">
+        Dictation
+      </message>
+      <message name="IDS_ASH_SWITCH_ACCESS_INCREMENT" desc="The label for the Switch Access menu option to increment the selected input.">
+        Increment
+      </message>
+      <message name="IDS_ASH_SWITCH_ACCESS_KEYBOARD" desc="The label for the Switch Access menu option to open the onscreen keyboard.">
+        Keyboard
+      </message>
       <message name="IDS_ASH_SWITCH_ACCESS_SCROLL_DOWN" desc="The label for the Switch Access menu option to scroll the selected view down.">
         Scroll Down
       </message>
+      <message name="IDS_ASH_SWITCH_ACCESS_SCROLL_LEFT" desc="The label for the Switch Access menu option to scroll the selected view left.">
+        Scroll Left
+      </message>
+      <message name="IDS_ASH_SWITCH_ACCESS_SCROLL_RIGHT" desc="The label for the Switch Access menu option to scroll the selected view right.">
+        Scroll Right
+      </message>
+      <message name="IDS_ASH_SWITCH_ACCESS_SCROLL_UP" desc="The label for the Switch Access menu option to scroll the selected view up.">
+        Scroll Up
+      </message>
       <message name="IDS_ASH_SWITCH_ACCESS_SELECT" desc="The label for the Switch Access menu option to select the focused element.">
         Select
       </message>

ash/resources/vector_icons/BUILD.gn

@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD - style license that can be
 # found in the LICENSE file.
 
-  import("//build/config/chrome_build.gni")
+import("//build/config/chrome_build.gni")
 import("//components/vector_icons/vector_icons.gni")
 
 aggregate_vector_icons("ash_vector_icons") {
@@ -146,7 +146,13 @@ aggregate_vector_icons("ash_vector_icons") {
     "shelf_unlock_button.icon",
     "switch_access.icon",
     "switch_access_back.icon",
+    "switch_access_decrement.icon",
+    "switch_access_increment.icon",
+    "switch_access_keyboard.icon",
     "switch_access_scroll_down.icon",
+    "switch_access_scroll_left.icon",
+    "switch_access_scroll_right.icon",
+    "switch_access_scroll_up.icon",
     "switch_access_select.icon",
     "switch_access_settings.icon",
     "system_menu_accessibility.icon",

ash/resources/vector_icons/switch_access_decrement.icon

+// Copyright 2020 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.
+
+CANVAS_DIMENSIONS, 20,
+MOVE_TO, 14, 9,
+R_V_LINE_TO, 2,
+H_LINE_TO, 6,
+V_LINE_TO, 9,
+CLOSE,
+R_MOVE_TO, -4, -7,
+R_CUBIC_TO, -4.42f, 0, -8, 3.58f, -8, 8,
+R_CUBIC_TO, 0, 4.42f, 3.58f, 8, 8, 8,
+R_CUBIC_TO, 4.42f, 0, 8, -3.58f, 8, -8,
+R_CUBIC_TO, 0, -4.42f, -3.58f, -8, -8, -8,
+CLOSE,
+R_MOVE_TO, 0, 14,
+R_CUBIC_TO, -3.31f, 0, -6, -2.69f, -6, -6,
+R_CUBIC_TO, 0, -3.31f, 2.69f, -6, 6, -6,
+R_CUBIC_TO, 3.31f, 0, 6, 2.69f, 6, 6,
+R_CUBIC_TO, 0, 3.31f, -2.69f, 6, -6, 6,
+CLOSE

ash/resources/vector_icons/switch_access_increment.icon

+// Copyright 2020 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.
+
+CANVAS_DIMENSIONS, 20,
+MOVE_TO, 14, 9,
+R_V_LINE_TO, 2,
+R_H_LINE_TO, -3,
+R_V_LINE_TO, 3,
+H_LINE_TO, 9,
+R_V_LINE_TO, -3,
+H_LINE_TO, 6,
+V_LINE_TO, 9,
+R_H_LINE_TO, 3,
+V_LINE_TO, 6,
+R_H_LINE_TO, 2,
+R_V_LINE_TO, 3,
+CLOSE,
+R_MOVE_TO, -4, -7,
+R_CUBIC_TO, -4.42f, 0, -8, 3.58f, -8, 8,
+R_CUBIC_TO, 0, 4.42f, 3.58f, 8, 8, 8,
+R_CUBIC_TO, 4.42f, 0, 8, -3.58f, 8, -8,
+R_CUBIC_TO, 0, -4.42f, -3.58f, -8, -8, -8,
+CLOSE,
+R_MOVE_TO, 0, 14,
+R_CUBIC_TO, -3.31f, 0, -6, -2.69f, -6, -6,
+R_CUBIC_TO, 0, -3.31f, 2.69f, -6, 6, -6,
+R_CUBIC_TO, 3.31f, 0, 6, 2.69f, 6, 6,
+R_CUBIC_TO, 0, 3.31f, -2.69f, 6, -6, 6,
+CLOSE
+

ash/resources/vector_icons/switch_access_keyboard.icon

+// Copyright 2020 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.
+
+CANVAS_DIMENSIONS, 24,
+MOVE_TO, 20, 7,
+R_V_LINE_TO, 10,
+H_LINE_TO, 4,
+V_LINE_TO, 7,
+R_H_LINE_TO, 16,
+R_MOVE_TO, 0, -2,
+H_LINE_TO, 4,
+R_CUBIC_TO, -1.1f, 0, -1.99f, 0.9f, -1.99f, 2,
+LINE_TO, 2, 17,
+R_CUBIC_TO, 0, 1.1f, 0.9f, 2, 2, 2,
+R_H_LINE_TO, 16,
+R_CUBIC_TO, 1.1f, 0, 2, -0.9f, 2, -2,
+V_LINE_TO, 7,
+R_CUBIC_TO, 0, -1.1f, -0.9f, -2, -2, -2,
+CLOSE,
+R_MOVE_TO, -9, 3,
+R_H_LINE_TO, 2,
+R_V_LINE_TO, 2,
+R_H_LINE_TO, -2,
+CLOSE,
+R_MOVE_TO, 0, 3,
+R_H_LINE_TO, 2,
+R_V_LINE_TO, 2,
+R_H_LINE_TO, -2,
+CLOSE,
+MOVE_TO, 8, 8,
+R_H_LINE_TO, 2,
+R_V_LINE_TO, 2,
+H_LINE_TO, 8,
+CLOSE,
+R_MOVE_TO, 0, 3,
+R_H_LINE_TO, 2,
+R_V_LINE_TO, 2,
+H_LINE_TO, 8,
+CLOSE,
+R_MOVE_TO, -3, 0,
+R_H_LINE_TO, 2,
+R_V_LINE_TO, 2,
+H_LINE_TO, 5,
+CLOSE,
+R_MOVE_TO, 0, -3,
+R_H_LINE_TO, 2,
+R_V_LINE_TO, 2,
+H_LINE_TO, 5,
+CLOSE,
+R_MOVE_TO, 3, 6,
+R_H_LINE_TO, 8,
+R_V_LINE_TO, 2,
+H_LINE_TO, 8,
+CLOSE,
+R_MOVE_TO, 6, -3,
+R_H_LINE_TO, 2,
+R_V_LINE_TO, 2,
+R_H_LINE_TO, -2,
+CLOSE,
+R_MOVE_TO, 0, -3,
+R_H_LINE_TO, 2,
+R_V_LINE_TO, 2,
+R_H_LINE_TO, -2,
+CLOSE,
+R_MOVE_TO, 3, 3,
+R_H_LINE_TO, 2,
+R_V_LINE_TO, 2,
+R_H_LINE_TO, -2,
+CLOSE,
+R_MOVE_TO, 0, -3,
+R_H_LINE_TO, 2,
+R_V_LINE_TO, 2,
+R_H_LINE_TO, -2,
+CLOSE

ash/resources/vector_icons/switch_access_scroll_left.icon

+// Copyright 2020 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.
+
+CANVAS_DIMENSIONS, 20,
+MOVE_TO, 10.29f, 11,
+R_LINE_TO, 1.96f, 1.87f,
+LINE_TO, 11.09f, 14,
+LINE_TO, 7, 10,
+R_LINE_TO, 4.09f, -4,
+R_LINE_TO, 1.16f, 1.13f,
+LINE_TO, 10.37f, 9,
+H_LINE_TO, 17,
+R_V_LINE_TO, 2,
+CLOSE,
+MOVE_TO, 3, 14,
+V_LINE_TO, 6,
+R_H_LINE_TO, 2,
+R_V_LINE_TO, 8,
+CLOSE

ash/resources/vector_icons/switch_access_scroll_right.icon

+// Copyright 2020 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.
+
+CANVAS_DIMENSIONS, 20,
+MOVE_TO, 9.71f, 9,
+LINE_TO, 7.76f, 7.13f,
+LINE_TO, 8.91f, 6,
+LINE_TO, 13, 10,
+R_LINE_TO, -4.09f, 4,
+R_LINE_TO, -1.15f, -1.13f,
+LINE_TO, 9.63f, 11,
+H_LINE_TO, 3,
+V_LINE_TO, 9,
+CLOSE,
+MOVE_TO, 17, 6,
+R_V_LINE_TO, 8,
+R_H_LINE_TO, -2,
+V_LINE_TO, 6,
+CLOSE
+

ash/resources/vector_icons/switch_access_scroll_up.icon

+// Copyright 2020 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.
+
+CANVAS_DIMENSIONS, 20,
+MOVE_TO, 9, 10.29f,
+R_LINE_TO, -1.87f, 1.96f,
+LINE_TO, 6, 11.09f,
+LINE_TO, 10, 7,
+R_LINE_TO, 4, 4.09f,
+R_LINE_TO, -1.13f, 1.16f,
+LINE_TO, 11, 10.37f,
+V_LINE_TO, 17,
+H_LINE_TO, 9,
+CLOSE,
+MOVE_TO, 6, 3,
+R_H_LINE_TO, 8,
+R_V_LINE_TO, 2,
+H_LINE_TO, 6,
+CLOSE
+

ash/system/accessibility/switch_access_back_button_bubble_controller.cc

@@ -10,12 +10,32 @@
 #include "ash/system/tray/tray_background_view.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/unified/unified_system_tray_view.h"
+#include "ui/display/display.h"
+#include "ui/display/screen.h"
 
 namespace ash {
 
 namespace {
+
 constexpr int kBackButtonRadiusDip = 18;
 constexpr int kBackButtonDiameterDip = 2 * kBackButtonRadiusDip;
+
+// The back button should display above and to the right of the anchor rect
+// provided. Because the TrayBubbleView defaults to showing the right edges
+// lining up (rather than appearing off to the side) we'll add the width of the
+// button to the anchor rect's width.
+gfx::Rect AdjustAnchorRect(const gfx::Rect& anchor) {
+  gfx::Rect adjusted_anchor(anchor.x(), anchor.y(),
+                            anchor.width() + kBackButtonDiameterDip,
+                            anchor.height());
+
+  // Don't allow our new rect to extend past the edge of the display.
+  display::Display display =
+      display::Screen::GetScreen()->GetDisplayMatching(anchor);
+  adjusted_anchor.Intersect(display.bounds());
+  return adjusted_anchor;
+}
+
 }  // namespace
 
 SwitchAccessBackButtonBubbleController::
@@ -31,7 +51,7 @@ void SwitchAccessBackButtonBubbleController::ShowBackButton(
     const gfx::Rect& anchor) {
   if (widget_) {
     DCHECK(bubble_view_);
-    bubble_view_->ChangeAnchorRect(anchor);
+    bubble_view_->ChangeAnchorRect(AdjustAnchorRect(anchor));
     return;
   }
 
@@ -42,7 +62,7 @@ void SwitchAccessBackButtonBubbleController::ShowBackButton(
       Shell::GetContainer(Shell::GetPrimaryRootWindow(),
                           kShellWindowId_AccessibilityPanelContainer);
   init_params.anchor_mode = TrayBubbleView::AnchorMode::kRect;
-  init_params.anchor_rect = anchor;
+  init_params.anchor_rect = AdjustAnchorRect(anchor);
   init_params.is_anchored_to_status_area = false;
   init_params.has_shadow = false;
 

ash/system/accessibility/switch_access_back_button_view.cc

@@ -9,6 +9,8 @@
 #include "ash/system/accessibility/floating_menu_button.h"
 #include "ash/system/tray/tray_constants.h"
 #include "cc/paint/paint_flags.h"
+#include "ui/accessibility/ax_node_data.h"
+#include "ui/accessibility/mojom/ax_node_data.mojom-shared.h"
 #include "ui/events/event.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_palette.h"
@@ -18,6 +20,10 @@
 
 namespace ash {
 
+namespace {
+constexpr char kUniqueId[] = "switch_access_back_button";
+}  // namespace
+
 SwitchAccessBackButtonView::SwitchAccessBackButtonView(int diameter)
     : diameter_(diameter),
       back_button_(
@@ -34,9 +40,13 @@ SwitchAccessBackButtonView::SwitchAccessBackButtonView(int diameter)
 
 void SwitchAccessBackButtonView::ButtonPressed(views::Button* sender,
                                                const ui::Event& event) {
-  // This code should not be called presently, as the button is never shown.
-  // TODO(crbug/973719): Transition to using new back button and menu which
-  //                     will be implemented using views/.
+  NotifyAccessibilityEvent(ax::mojom::Event::kClicked,
+                           /*send_native_event=*/false);
+}
+
+void SwitchAccessBackButtonView::GetAccessibleNodeData(
+    ui::AXNodeData* node_data) {
+  node_data->html_attributes.push_back(std::make_pair("id", kUniqueId));
 }
 
 const char* SwitchAccessBackButtonView::GetClassName() const {

ash/system/accessibility/switch_access_back_button_view.h

@@ -27,6 +27,7 @@ class SwitchAccessBackButtonView : public views::View,
   void ButtonPressed(views::Button* sender, const ui::Event& event) override;
 
   // views::View:
+  void GetAccessibleNodeData(ui::AXNodeData* node_data) override;
   const char* GetClassName() const override;
   void OnPaint(gfx::Canvas* canvas) override;
 

ash/system/accessibility/switch_access_menu_bubble_controller.cc

@@ -27,10 +27,15 @@ void SwitchAccessMenuBubbleController::ShowBackButton(const gfx::Rect& anchor) {
   back_button_controller_->ShowBackButton(anchor);
 }
 
-void SwitchAccessMenuBubbleController::ShowMenu(const gfx::Rect& anchor) {
+void SwitchAccessMenuBubbleController::ShowMenu(
+    const gfx::Rect& anchor,
+    const std::vector<std::string>& actions_to_show) {
   if (widget_) {
     DCHECK(bubble_view_);
+    menu_view_->SetActions(actions_to_show);
+    bubble_view_->SetPreferredWidth(menu_view_->GetBubbleWidthDip());
     bubble_view_->ChangeAnchorRect(anchor);
+    ShowBackButtonForMenu();
     return;
   }
 
@@ -50,6 +55,7 @@ void SwitchAccessMenuBubbleController::ShowMenu(const gfx::Rect& anchor) {
   bubble_view_ = new TrayBubbleView(init_params);
 
   menu_view_ = new SwitchAccessMenuView();
+  menu_view_->SetActions(actions_to_show);
   menu_view_->SetBorder(
       views::CreateEmptyBorder(kUnifiedTopShortcutSpacing, 0, 0, 0));
   bubble_view_->SetPreferredWidth(menu_view_->GetBubbleWidthDip());
@@ -61,6 +67,7 @@ void SwitchAccessMenuBubbleController::ShowMenu(const gfx::Rect& anchor) {
   widget_ = views::BubbleDialogDelegateView::CreateBubble(bubble_view_);
   TrayBackgroundView::InitializeBubbleAnimations(widget_);
   bubble_view_->InitializeAndShowBubble();
+  ShowBackButtonForMenu();
 }
 
 void SwitchAccessMenuBubbleController::CloseAll() {
@@ -75,4 +82,9 @@ void SwitchAccessMenuBubbleController::BubbleViewDestroyed() {
   widget_ = nullptr;
 }
 
+void SwitchAccessMenuBubbleController::ShowBackButtonForMenu() {
+  gfx::Rect widget_bounds = widget_->GetWindowBoundsInScreen();
+  ShowBackButton(widget_bounds);
+}
+
 }  // namespace ash

ash/system/accessibility/switch_access_menu_bubble_controller.h

@@ -25,7 +25,8 @@ class ASH_EXPORT SwitchAccessMenuBubbleController
       const SwitchAccessMenuBubbleController&) = delete;
 
   void ShowBackButton(const gfx::Rect& anchor);
-  void ShowMenu(const gfx::Rect& anchor);
+  void ShowMenu(const gfx::Rect& anchor,
+                const std::vector<std::string>& actions_to_show);
   void CloseAll();
 
   // TrayBubbleView::Delegate:
@@ -34,6 +35,8 @@ class ASH_EXPORT SwitchAccessMenuBubbleController
  private:
   friend class SwitchAccessMenuBubbleControllerTest;
 
+  void ShowBackButtonForMenu();
+
   std::unique_ptr<SwitchAccessBackButtonBubbleController>
       back_button_controller_;
 

ash/system/accessibility/switch_access_menu_bubble_controller_unittest.cc

@@ -45,9 +45,14 @@ class SwitchAccessMenuBubbleControllerTest : public AshTestBase {
   }
 
   std::vector<SwitchAccessMenuButton*> GetMenuButtons() {
-    return std::vector<SwitchAccessMenuButton*>(
-        {GetMenuView()->scroll_down_button_, GetMenuView()->select_button_,
-         GetMenuView()->settings_button_});
+    std::vector<SwitchAccessMenuButton*> buttons;
+    for (views::View* button : GetMenuView()->children())
+      buttons.push_back(static_cast<SwitchAccessMenuButton*>(button));
+    return buttons;
+  }
+
+  std::string GetName(SwitchAccessMenuButton* button) {
+    return button->action_name_;
   }
 
   gfx::Rect GetBackButtonBounds() {
@@ -68,7 +73,6 @@ class SwitchAccessMenuBubbleControllerTest : public AshTestBase {
 
 // TODO(anastasi): Add more tests for closing and repositioning the button.
 TEST_F(SwitchAccessMenuBubbleControllerTest, ShowBackButton) {
-  EXPECT_TRUE(GetBubbleController());
   gfx::Rect anchor_rect(100, 100, 0, 0);
   GetBubbleController()->ShowBackButton(anchor_rect);
 
@@ -78,9 +82,9 @@ TEST_F(SwitchAccessMenuBubbleControllerTest, ShowBackButton) {
 }
 
 TEST_F(SwitchAccessMenuBubbleControllerTest, ShowMenu) {
-  EXPECT_TRUE(GetBubbleController());
   gfx::Rect anchor_rect(10, 10, 0, 0);
-  GetBubbleController()->ShowMenu(anchor_rect);
+  GetBubbleController()->ShowMenu(anchor_rect,
+                                  {"select", "scrollDown", "settings"});
   EXPECT_TRUE(GetMenuView());
 
   for (SwitchAccessMenuButton* button : GetMenuButtons()) {
@@ -91,4 +95,29 @@ TEST_F(SwitchAccessMenuBubbleControllerTest, ShowMenu) {
   EXPECT_EQ(GetMenuView()->width(), GetExpectedBubbleWidth());
 }
 
+TEST_F(SwitchAccessMenuBubbleControllerTest, SetActions) {
+  gfx::Rect anchor_rect(10, 10, 0, 0);
+  GetBubbleController()->ShowMenu(anchor_rect,
+                                  {"select", "scrollDown", "settings"});
+  EXPECT_TRUE(GetMenuView());
+
+  std::vector<SwitchAccessMenuButton*> buttons = GetMenuButtons();
+  EXPECT_EQ(3ul, buttons.size());
+  EXPECT_EQ("select", GetName(buttons[0]));
+  EXPECT_EQ("scrollDown", GetName(buttons[1]));
+  EXPECT_EQ("settings", GetName(buttons[2]));
+
+  GetBubbleController()->ShowMenu(
+      anchor_rect,
+      {"keyboard", "dictation", "increment", "decrement", "settings"});
+
+  buttons = GetMenuButtons();
+  EXPECT_EQ(5ul, buttons.size());
+  EXPECT_EQ("keyboard", GetName(buttons[0]));
+  EXPECT_EQ("dictation", GetName(buttons[1]));
+  EXPECT_EQ("increment", GetName(buttons[2]));
+  EXPECT_EQ("decrement", GetName(buttons[3]));
+  EXPECT_EQ("settings", GetName(buttons[4]));
+}
+
 }  // namespace ash

ash/system/accessibility/switch_access_menu_button.cc

@@ -5,6 +5,8 @@
 #include "ash/system/accessibility/switch_access_menu_button.h"
 
 #include "ash/style/ash_color_provider.h"
+#include "ui/accessibility/ax_node_data.h"
+#include "ui/accessibility/mojom/ax_node_data.mojom-shared.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/paint_vector_icon.h"
@@ -29,10 +31,11 @@ constexpr int kLabelTopPaddingSmallDip = 8;
 constexpr int kTextLineHeightDip = 20;
 }  // namespace
 
-SwitchAccessMenuButton::SwitchAccessMenuButton(views::ButtonListener* listener,
+SwitchAccessMenuButton::SwitchAccessMenuButton(std::string action_name,
                                                const gfx::VectorIcon& icon,
                                                int label_text_id)
-    : views::Button(listener),
+    : views::Button(this),
+      action_name_(action_name),
       image_view_(new views::ImageView()),
       label_(new views::Label(l10n_util::GetStringUTF16(label_text_id),
                               views::style::CONTEXT_BUTTON)) {
@@ -73,4 +76,16 @@ SwitchAccessMenuButton::SwitchAccessMenuButton(views::ButtonListener* listener,
   SetLayoutManager(std::move(layout));
 }
 
+void SwitchAccessMenuButton::ButtonPressed(views::Button* sender,
+                                           const ui::Event& event) {
+  NotifyAccessibilityEvent(ax::mojom::Event::kClicked,
+                           /*send_native_event=*/false);
+}
+
+void SwitchAccessMenuButton::GetAccessibleNodeData(ui::AXNodeData* node_data) {
+  views::Button::GetAccessibleNodeData(node_data);
+  node_data->AddStringAttribute(ax::mojom::StringAttribute::kValue,
+                                action_name_);
+}
+
 }  // namespace ash

ash/system/accessibility/switch_access_menu_button.h

@@ -18,9 +18,10 @@ class Label;
 
 namespace ash {
 
-class SwitchAccessMenuButton : public views::Button {
+class SwitchAccessMenuButton : public views::Button,
+                               public views::ButtonListener {
  public:
-  SwitchAccessMenuButton(views::ButtonListener* listener,
+  SwitchAccessMenuButton(std::string action_name,
                          const gfx::VectorIcon& icon,
                          int accessible_name_id);
   ~SwitchAccessMenuButton() override = default;
@@ -30,7 +31,17 @@ class SwitchAccessMenuButton : public views::Button {
 
   static constexpr int kWidthDip = 80;
 
+  // views::ButtonListener:
+  void ButtonPressed(views::Button* sender, const ui::Event& event) override;
+
+  // views::View:
+  void GetAccessibleNodeData(ui::AXNodeData* node_data) override;
+
  private:
+  friend class SwitchAccessMenuBubbleControllerTest;
+
+  std::string action_name_;
+
   // Owned by the views hierarchy.
   views::ImageView* image_view_;
   views::Label* label_;

ash/system/accessibility/switch_access_menu_view.cc

@@ -4,34 +4,68 @@
 
 #include "ash/system/accessibility/switch_access_menu_view.h"
 
+#include "ash/accessibility/accessibility_controller_impl.h"
 #include "ash/resources/vector_icons/vector_icons.h"
+#include "ash/shell.h"
 #include "ash/strings/grit/ash_strings.h"
 #include "ash/system/accessibility/switch_access_menu_button.h"
 #include "ash/system/tray/tray_constants.h"
+#include "ui/accessibility/ax_node_data.h"
+#include "ui/accessibility/mojom/ax_node_data.mojom-shared.h"
 #include "ui/events/event.h"
 #include "ui/views/layout/box_layout.h"
 
 namespace ash {
 
-SwitchAccessMenuView::SwitchAccessMenuView()
-    : scroll_down_button_(
-          new SwitchAccessMenuButton(this,
-                                     kSwitchAccessScrollDownIcon,
-                                     IDS_ASH_SWITCH_ACCESS_SCROLL_DOWN)),
-      select_button_(new SwitchAccessMenuButton(this,
-                                                kSwitchAccessSelectIcon,
-                                                IDS_ASH_SWITCH_ACCESS_SELECT)),
-      settings_button_(
-          new SwitchAccessMenuButton(this,
-                                     kSwitchAccessSettingsIcon,
-                                     IDS_ASH_SWITCH_ACCESS_SETTINGS)) {
+namespace {
+constexpr char kUniqueId[] = "switch_access_menu_view";
+
+struct ButtonInfo {
+  const char* name;
+  const gfx::VectorIcon* icon;
+  int label_id;
+};
+
+// These strings must match the values of
+// accessibility_private::SwitchAccessMenuAction.
+const ButtonInfo kMenuButtonDetails[] = {
+    {"decrement", &kSwitchAccessDecrementIcon, IDS_ASH_SWITCH_ACCESS_DECREMENT},
+    {"dictation", &kDictationOnNewuiIcon, IDS_ASH_SWITCH_ACCESS_DICTATION},
+    {"increment", &kSwitchAccessIncrementIcon, IDS_ASH_SWITCH_ACCESS_INCREMENT},
+    {"keyboard", &kSwitchAccessKeyboardIcon, IDS_ASH_SWITCH_ACCESS_KEYBOARD},
+    {"scrollDown", &kSwitchAccessScrollDownIcon,
+     IDS_ASH_SWITCH_ACCESS_SCROLL_DOWN},
+    {"scrollLeft", &kSwitchAccessScrollLeftIcon,
+     IDS_ASH_SWITCH_ACCESS_SCROLL_LEFT},
+    {"scrollRight", &kSwitchAccessScrollRightIcon,
+     IDS_ASH_SWITCH_ACCESS_SCROLL_RIGHT},
+    {"scrollUp", &kSwitchAccessScrollUpIcon, IDS_ASH_SWITCH_ACCESS_SCROLL_UP},
+    {"select", &kSwitchAccessSelectIcon, IDS_ASH_SWITCH_ACCESS_SELECT},
+    {"settings", &kSwitchAccessSettingsIcon, IDS_ASH_SWITCH_ACCESS_SETTINGS},
+};
+
+}  // namespace
+
+SwitchAccessMenuView::SwitchAccessMenuView() {
   SetLayoutManager(std::make_unique<views::BoxLayout>(
       views::BoxLayout::Orientation::kHorizontal, kUnifiedMenuItemPadding,
       kUnifiedMenuPadding));
+}
+
+SwitchAccessMenuView::~SwitchAccessMenuView() {}
+
+void SwitchAccessMenuView::SetActions(std::vector<std::string> actions) {
+  RemoveAllChildViews(/*delete_children=*/true);
 
-  AddChildView(select_button_);
-  AddChildView(scroll_down_button_);
-  AddChildView(settings_button_);
+  for (std::string action : actions) {
+    for (ButtonInfo info : kMenuButtonDetails) {
+      if (action == info.name) {
+        AddChildView(
+            new SwitchAccessMenuButton(info.name, *info.icon, info.label_id));
+        break;
+      }
+    }
+  }
 }
 
 int SwitchAccessMenuView::GetBubbleWidthDip() const {
@@ -42,10 +76,9 @@ int SwitchAccessMenuView::GetBubbleWidthDip() const {
          kUnifiedMenuItemPadding.left() + kUnifiedMenuItemPadding.right();
 }
 
-void SwitchAccessMenuView::ButtonPressed(views::Button* sender,
-                                         const ui::Event& event) {
-  // TODO(crbug/973719): Transition to using new back button and menu which
-  //                     will be implemented using views/.
+void SwitchAccessMenuView::GetAccessibleNodeData(ui::AXNodeData* node_data) {
+  node_data->role = ax::mojom::Role::kMenu;
+  node_data->html_attributes.push_back(std::make_pair("id", kUniqueId));
 }
 
 const char* SwitchAccessMenuView::GetClassName() const {

ash/system/accessibility/switch_access_menu_view.h

@@ -5,37 +5,31 @@
 #ifndef ASH_SYSTEM_ACCESSIBILITY_SWITCH_ACCESS_MENU_VIEW_H_
 #define ASH_SYSTEM_ACCESSIBILITY_SWITCH_ACCESS_MENU_VIEW_H_
 
-#include "ui/views/controls/button/button.h"
+#include <vector>
+
+#include "base/containers/flat_map.h"
 #include "ui/views/view.h"
 
 namespace ash {
 
-class SwitchAccessMenuButton;
-
 // View for the Switch Access menu.
-class SwitchAccessMenuView : public views::View, public views::ButtonListener {
+class SwitchAccessMenuView : public views::View {
  public:
   SwitchAccessMenuView();
-  ~SwitchAccessMenuView() override = default;
+  ~SwitchAccessMenuView() override;
 
   SwitchAccessMenuView(const SwitchAccessMenuView&) = delete;
   SwitchAccessMenuView& operator=(const SwitchAccessMenuView&) = delete;
 
   int GetBubbleWidthDip() const;
-
-  // views::ButtonListener:
-  void ButtonPressed(views::Button* sender, const ui::Event& event) override;
+  void SetActions(std::vector<std::string> actions);
 
   // views::View:
+  void GetAccessibleNodeData(ui::AXNodeData* node_data) override;
   const char* GetClassName() const override;
 
  private:
   friend class SwitchAccessMenuBubbleControllerTest;
-
-  // Owned by the views hierarchy.
-  SwitchAccessMenuButton* scroll_down_button_;
-  SwitchAccessMenuButton* select_button_;
-  SwitchAccessMenuButton* settings_button_;
 };
 
 }  // namespace ash

third_party/closure_compiler/externs/accessibility_private.js

@@ -70,6 +70,22 @@ chrome.accessibilityPrivate.SwitchAccessCommand = {
   PREVIOUS: 'previous',
 };
 
+/**
+ * @enum {string}
+ */
+chrome.accessibilityPrivate.SwitchAccessMenuAction = {
+  DECREMENT: 'decrement',
+  DICTATION: 'dictation',
+  INCREMENT: 'increment',
+  KEYBOARD: 'keyboard',
+  SCROLL_DOWN: 'scroll_down',
+  SCROLL_LEFT: 'scroll_left',
+  SCROLL_RIGHT: 'scroll_right',
+  SCROLL_UP: 'scroll_up',
+  SELECT: 'select',
+  SETTINGS: 'settings',
+};
+
 /**
  * @enum {string}
  */