[omnibox] Make ToggleImageButton support accessible names

Currently, ToggleImageButton relies on the tooltip text to provide the
accessible name.

In some circumstances, we want a more explanatory AX name than the
tooltip text, and this is supported by the base Button class.

This CL expands ToggleImageButton to support a different AX name than
the tooltip text, in both toggled and untoggled states.

Bug: 1099788
Change-Id: Icfdcaac4ba50ba233e33663df74a0c32680bce07
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2292724
Auto-Submit: Tommy Li <tommycli@chromium.org>
Reviewed-by: Allen Bauer <kylixrd@chromium.org>
Commit-Queue: Tommy Li <tommycli@chromium.org>
Cr-Commit-Position: refs/heads/master@{#788644}

ui/views/controls/button/image_button.cc

@@ -244,6 +244,10 @@ void ToggleImageButton::SetToggledTooltipText(const base::string16& tooltip) {
   toggled_tooltip_text_ = tooltip;
 }
 
+void ToggleImageButton::SetToggledAccessibleName(const base::string16& name) {
+  toggled_accessible_name_ = name;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // ToggleImageButton, ImageButton overrides:
 
@@ -277,7 +281,13 @@ base::string16 ToggleImageButton::GetTooltipText(const gfx::Point& p) const {
 
 void ToggleImageButton::GetAccessibleNodeData(ui::AXNodeData* node_data) {
   ImageButton::GetAccessibleNodeData(node_data);
-  node_data->SetName(GetTooltipText(gfx::Point()));
+  if (!toggled_)
+    return;
+
+  if (!toggled_accessible_name_.empty())
+    node_data->SetName(toggled_accessible_name_);
+  else if (!toggled_tooltip_text_.empty())
+    node_data->SetName(toggled_tooltip_text_);
 
   // Use the visual pressed image as a cue for making this control into an
   // accessible toggle button.

ui/views/controls/button/image_button.h

@@ -133,6 +133,9 @@ class VIEWS_EXPORT ToggleImageButton : public ImageButton {
   // Set the tooltip text displayed when the button is toggled.
   void SetToggledTooltipText(const base::string16& tooltip);
 
+  // Set the accessible text used when the button is toggled.
+  void SetToggledAccessibleName(const base::string16& name);
+
   // Overridden from ImageButton:
   const gfx::ImageSkia& GetImage(ButtonState state) const override;
   void SetImage(ButtonState state, const gfx::ImageSkia& image) override;
@@ -156,6 +159,10 @@ class VIEWS_EXPORT ToggleImageButton : public ImageButton {
   // this one is shown when toggled.
   base::string16 toggled_tooltip_text_;
 
+  // The parent class's accessibility data is used when not toggled, and this
+  // one is used when toggled.
+  base::string16 toggled_accessible_name_;
+
   DISALLOW_COPY_AND_ASSIGN(ToggleImageButton);
 };