views: fix IconLabelBubbleView accessibility properties

IconLabelBubbleView is a Button and should use Button::GetAccessibleNodeData,
not Label::GetAccessibleNodeData. Setting its button text causes the right
behavior here.

Before: "This site is using your location."
After: "This site is using your location. Button."

Maybe ideally: "This site is using your location. Manage location access.
               Button."

... but that requires new strings.

Bug: 879014
Change-Id: I7b4840e17ea70eede41ee0b3095a8a2de288c6ea
Reviewed-on: https://chromium-review.googlesource.com/c/1331668
Commit-Queue: Elly Fong-Jones <ellyjones@chromium.org>
Reviewed-by: Elly Fong-Jones <ellyjones@chromium.org>
Reviewed-by: Aaron Leventhal <aleventhal@chromium.org>
Cr-Commit-Position: refs/heads/master@{#607608}

chrome/browser/ui/views/location_bar/content_setting_image_view.cc

@@ -47,6 +47,7 @@ void ContentSettingImageView::Update() {
   // Note: We explicitly want to call this even if |web_contents| is NULL, so we
   // get hidden properly while the user is editing the omnibox.
   content_setting_image_model_->Update(web_contents);
+  SetTooltipText(content_setting_image_model_->get_tooltip());
 
   if (!content_setting_image_model_->is_visible()) {
     SetVisible(false);
@@ -90,12 +91,6 @@ void ContentSettingImageView::OnBoundsChanged(
   IconLabelBubbleView::OnBoundsChanged(previous_bounds);
 }
 
-bool ContentSettingImageView::GetTooltipText(const gfx::Point& p,
-                                             base::string16* tooltip) const {
-  *tooltip = content_setting_image_model_->get_tooltip();
-  return !tooltip->empty();
-}
-
 bool ContentSettingImageView::OnMousePressed(const ui::MouseEvent& event) {
   // Pause animation so that the icon does not shrink and deselect while the
   // user is attempting to press it.

chrome/browser/ui/views/location_bar/content_setting_image_view.h

@@ -70,8 +70,6 @@ class ContentSettingImageView : public IconLabelBubbleView,
   // IconLabelBubbleView:
   const char* GetClassName() const override;
   void OnBoundsChanged(const gfx::Rect& previous_bounds) override;
-  bool GetTooltipText(const gfx::Point& p,
-                      base::string16* tooltip) const override;
   bool OnMousePressed(const ui::MouseEvent& event) override;
   bool OnKeyPressed(const ui::KeyEvent& event) override;
   void OnNativeThemeChanged(const ui::NativeTheme* native_theme) override;

chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc

@@ -167,6 +167,7 @@ bool IconLabelBubbleView::ShouldShowLabel() const {
 }
 
 void IconLabelBubbleView::SetLabel(const base::string16& label) {
+  SetAccessibleName(label);
   label_->SetText(label);
   separator_view_->SetVisible(ShouldShowSeparator());
 }
@@ -289,17 +290,6 @@ bool IconLabelBubbleView::OnMousePressed(const ui::MouseEvent& event) {
   return Button::OnMousePressed(event);
 }
 
-void IconLabelBubbleView::GetAccessibleNodeData(ui::AXNodeData* node_data) {
-  label_->GetAccessibleNodeData(node_data);
-  if (node_data->GetStringAttribute(ax::mojom::StringAttribute::kName)
-          .empty()) {
-    // Fallback name when there is no accessible name from the label.
-    base::string16 tooltip_text;
-    GetTooltipText(gfx::Point(), &tooltip_text);
-    node_data->SetName(tooltip_text);
-  }
-}
-
 void IconLabelBubbleView::OnNativeThemeChanged(
     const ui::NativeTheme* native_theme) {
   label_->SetEnabledColor(GetTextColor());

chrome/browser/ui/views/location_bar/icon_label_bubble_view.h

@@ -135,7 +135,6 @@ class IconLabelBubbleView : public views::InkDropObserver,
   void OnBoundsChanged(const gfx::Rect& previous_bounds) override;
   void Layout() override;
   bool OnMousePressed(const ui::MouseEvent& event) override;
-  void GetAccessibleNodeData(ui::AXNodeData* node_data) override;
   void OnNativeThemeChanged(const ui::NativeTheme* native_theme) override;
   void AddInkDropLayer(ui::Layer* ink_drop_layer) override;
   void RemoveInkDropLayer(ui::Layer* ink_drop_layer) override;

chrome/browser/ui/views/location_bar/location_icon_view.cc

@@ -52,13 +52,6 @@ bool LocationIconView::OnMouseDragged(const ui::MouseEvent& event) {
   return IconLabelBubbleView::OnMouseDragged(event);
 }
 
-bool LocationIconView::GetTooltipText(const gfx::Point& p,
-                                      base::string16* tooltip) const {
-  if (show_tooltip_)
-    *tooltip = l10n_util::GetStringUTF16(IDS_TOOLTIP_LOCATION_ICON);
-  return show_tooltip_;
-}
-
 SkColor LocationIconView::GetTextColor() const {
   return delegate_->GetSecurityChipColor(
       delegate_->GetLocationBarModel()->GetSecurityLevel(false));
@@ -217,7 +210,9 @@ void LocationIconView::Update() {
 
   bool is_editing_or_empty = delegate_->IsEditingOrEmpty();
   // The tooltip should be shown if we are not editing or empty.
-  show_tooltip_ = !is_editing_or_empty;
+  SetTooltipText(is_editing_or_empty
+                     ? base::string16()
+                     : l10n_util::GetStringUTF16(IDS_TOOLTIP_LOCATION_ICON));
 
   // If the omnibox is empty or editing, the user should not be able to left
   // click on the icon. As such, the icon should not show a highlight or be

chrome/browser/ui/views/location_bar/location_icon_view.h

@@ -71,8 +71,6 @@ class LocationIconView : public IconLabelBubbleView {
   gfx::Size GetMinimumSize() const override;
   bool OnMousePressed(const ui::MouseEvent& event) override;
   bool OnMouseDragged(const ui::MouseEvent& event) override;
-  bool GetTooltipText(const gfx::Point& p,
-                      base::string16* tooltip) const override;
   SkColor GetTextColor() const override;
   bool ShouldShowSeparator() const override;
   bool ShouldShowExtraEndSpace() const override;
@@ -117,9 +115,6 @@ class LocationIconView : public IconLabelBubbleView {
 
   int GetSlideDurationTime() const override;
 
-  // True if hovering this view should display a tooltip.
-  bool show_tooltip_;
-
   Delegate* delegate_;
 
   // Used to scope the lifetime of asynchronous icon fetch callbacks to the