| Index: ui/views/controls/button/custom_button.h
|
| diff --git a/ui/views/controls/button/custom_button.h b/ui/views/controls/button/custom_button.h
|
| index 19d30cb833efa6285e76751c36b3c4f051bf4258..701dfe015962467d1870e7cf5856bf7ade1d7715 100644
|
| --- a/ui/views/controls/button/custom_button.h
|
| +++ b/ui/views/controls/button/custom_button.h
|
| @@ -110,7 +110,7 @@ class VIEWS_EXPORT CustomButton : public Button, public gfx::AnimationDelegate {
|
| void OnDragDone() override;
|
| void GetAccessibleState(ui::AXViewState* state) override;
|
| void VisibilityChanged(View* starting_from, bool is_visible) override;
|
| - std::unique_ptr<InkDropHover> CreateInkDropHover() const override;
|
| + std::unique_ptr<InkDropHighlight> CreateInkDropHighlight() const override;
|
| SkColor GetInkDropBaseColor() const override;
|
|
|
| // Overridden from gfx::AnimationDelegate:
|
| @@ -141,8 +141,8 @@ class VIEWS_EXPORT CustomButton : public Button, public gfx::AnimationDelegate {
|
| // we simply return IsTriggerableEvent(event).
|
| virtual bool ShouldEnterPushedState(const ui::Event& event);
|
|
|
| - // Returns true if hover effect should be visible.
|
| - virtual bool ShouldShowInkDropHover() const;
|
| + // Returns true if highlight effect should be visible.
|
| + virtual bool ShouldShowInkDropHighlight() const;
|
|
|
| void set_has_ink_drop_action_on_click(bool has_ink_drop_action_on_click) {
|
| has_ink_drop_action_on_click_ = has_ink_drop_action_on_click;
|
|
|