[Mac A11y] Set the bookmarks buttons to have a role description and

expose role description in AXPlatformNodeMac.

This ensures that screen reader users have context about what type of
button they are focused on when their focus moves to a bookmarks
button. This is particularly important when screen reader users move
by accessible pane to the bookmarks bar.

This CL also removes the message name IDS_ACCNAME_BOOKMARKS_MENU which
was no longer being used.

description of UI elements.

Bug: 1097760
Change-Id: If8d567bc349d21138fac83b19958aaf340803b09
AX-Relnotes: Give bookmarks buttons a role description and expose role
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2605467Reviewed-by: Elly Fong-Jones <ellyjones@chromium.org>
Commit-Queue: Abigail Klein <abigailbklein@google.com>
Cr-Commit-Position: refs/heads/master@{#840207}

chrome/app/generated_resources.grd

@@ -5867,9 +5867,11 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_ACCNAME_BOOKMARKS_CHEVRON" desc="The accessible name for the chevron visible if not all the bookmark buttons fit.">
         Menu containing hidden bookmarks
       </message>
-      <message name="IDS_ACCNAME_BOOKMARKS_MENU" desc="The accessible name for
-the Bookmarks menu.">
-        Bookmarks menu
+      <message name="IDS_ACCNAME_BOOKMARK_BUTTON_ROLE_DESCRIPTION" desc="The accessible role description for bookmark buttons.">
+        Bookmark button
+      </message>
+      <message name="IDS_ACCNAME_BOOKMARK_FOLDER_BUTTON_ROLE_DESCRIPTION" desc="The accessible role description for bookmark folders.">
+        Bookmark folder button
       </message>
       <message name="IDS_ACCNAME_SEPARATOR" desc="The accessible name for a separator.">
         Separator

chrome/app/generated_resources_grd/IDS_ACCNAME_BOOKMARK_BUTTON_ROLE_DESCRIPTION.png.sha1

+780b32fd1ebbddc89a5510c18d33df92c06f782c
\ No newline at end of file

chrome/app/generated_resources_grd/IDS_ACCNAME_BOOKMARK_FOLDER_BUTTON_ROLE_DESCRIPTION.png.sha1

+1f36bbc7f01bb4dc34731b29d71434030c557c84
\ No newline at end of file

chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc

@@ -201,6 +201,13 @@ class BookmarkButtonBase : public views::LabelButton {
     return CreateBookmarkButtonBorder();
   }
 
+  void GetAccessibleNodeData(ui::AXNodeData* node_data) override {
+    views::LabelButton::GetAccessibleNodeData(node_data);
+    node_data->AddStringAttribute(
+        ax::mojom::StringAttribute::kRoleDescription,
+        l10n_util::GetStringUTF8(IDS_ACCNAME_BOOKMARK_BUTTON_ROLE_DESCRIPTION));
+  }
+
  private:
   std::unique_ptr<gfx::SlideAnimation> show_animation_;
 
@@ -356,6 +363,14 @@ class BookmarkFolderButton : public BookmarkMenuButtonBase {
     return BookmarkMenuButtonBase::OnMousePressed(event);
   }
 
+  void GetAccessibleNodeData(ui::AXNodeData* node_data) override {
+    BookmarkMenuButtonBase::GetAccessibleNodeData(node_data);
+    node_data->AddStringAttribute(
+        ax::mojom::StringAttribute::kRoleDescription,
+        l10n_util::GetStringUTF8(
+            IDS_ACCNAME_BOOKMARK_FOLDER_BUTTON_ROLE_DESCRIPTION));
+  }
+
  private:
   std::unique_ptr<gfx::SlideAnimation> show_animation_;
 

ui/accessibility/platform/ax_platform_node_mac.mm

@@ -702,6 +702,10 @@ bool IsAXSetter(SEL selector) {
 }
 
 - (NSString*)AXRoleDescription {
+  if (_node->HasStringAttribute(ax::mojom::StringAttribute::kRoleDescription)) {
+    return [base::SysUTF8ToNSString(_node->GetStringAttribute(
+        ax::mojom::StringAttribute::kRoleDescription)) lowercaseString];
+  }
   switch (_node->GetData().role) {
     case ax::mojom::Role::kTab:
       // There is no NSAccessibilityTabRole or similar (AXRadioButton is used
@@ -1011,6 +1015,10 @@ bool IsAXSetter(SEL selector) {
   return [self AXSubrole];
 }
 
+- (NSString*)accessibilityRoleDescription {
+  return [self AXRoleDescription];
+}
+
 - (BOOL)isAccessibilitySelectorAllowed:(SEL)selector {
   if (!_node)
     return NO;