Commit 9cee95fc authored by Allen Bauer's avatar Allen Bauer Committed by Commit Bot

Make TooltipText and AccessibleName into properties on views::Button.

Bug: 938501
Change-Id: Id9b9e82b5b3c50fa8da4fba8c0b1dedcaca470d7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2416890Reviewed-by: default avatarAllen Bauer <kylixrd@chromium.org>
Reviewed-by: default avatarWei Li <weili@chromium.org>
Commit-Queue: Allen Bauer <kylixrd@chromium.org>
Cr-Commit-Position: refs/heads/master@{#808139}
parent 725362cf
...@@ -140,11 +140,19 @@ void Button::SetTooltipText(const base::string16& tooltip_text) { ...@@ -140,11 +140,19 @@ void Button::SetTooltipText(const base::string16& tooltip_text) {
tooltip_text_ = tooltip_text; tooltip_text_ = tooltip_text;
OnSetTooltipText(tooltip_text); OnSetTooltipText(tooltip_text);
TooltipTextChanged(); TooltipTextChanged();
OnPropertyChanged(&tooltip_text_, kPropertyEffectsNone);
NotifyAccessibilityEvent(ax::mojom::Event::kTextChanged, true); NotifyAccessibilityEvent(ax::mojom::Event::kTextChanged, true);
} }
base::string16 Button::GetTooltipText() const {
return tooltip_text_;
}
void Button::SetAccessibleName(const base::string16& name) { void Button::SetAccessibleName(const base::string16& name) {
if (name == accessible_name_)
return;
accessible_name_ = name; accessible_name_ = name;
OnPropertyChanged(&accessible_name_, kPropertyEffectsNone);
NotifyAccessibilityEvent(ax::mojom::Event::kTextChanged, true); NotifyAccessibilityEvent(ax::mojom::Event::kTextChanged, true);
} }
...@@ -599,7 +607,9 @@ DEFINE_ENUM_CONVERTERS( ...@@ -599,7 +607,9 @@ DEFINE_ENUM_CONVERTERS(
{Button::STATE_DISABLED, base::ASCIIToUTF16("STATE_DISABLED")}) {Button::STATE_DISABLED, base::ASCIIToUTF16("STATE_DISABLED")})
BEGIN_METADATA(Button, InkDropHostView) BEGIN_METADATA(Button, InkDropHostView)
ADD_PROPERTY_METADATA(base::string16, AccessibleName)
ADD_PROPERTY_METADATA(ButtonState, State) ADD_PROPERTY_METADATA(ButtonState, State)
ADD_PROPERTY_METADATA(base::string16, TooltipText)
END_METADATA END_METADATA
} // namespace views } // namespace views
...@@ -106,6 +106,7 @@ class VIEWS_EXPORT Button : public InkDropHostView, ...@@ -106,6 +106,7 @@ class VIEWS_EXPORT Button : public InkDropHostView,
void SetFocusForPlatform(); void SetFocusForPlatform();
void SetTooltipText(const base::string16& tooltip_text); void SetTooltipText(const base::string16& tooltip_text);
base::string16 GetTooltipText() const;
int tag() const { return tag_; } int tag() const { return tag_; }
void set_tag(int tag) { tag_ = tag; } void set_tag(int tag) { tag_ = tag; }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment