Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(844)

Unified Diff: ui/views/controls/button/custom_button.h

Issue 2034963002: Rename InkDropHover to InkDropHighlight (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix gyp file Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/animation/test/test_ink_drop_hover_observer.cc ('k') | ui/views/controls/button/custom_button.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
« no previous file with comments | « ui/views/animation/test/test_ink_drop_hover_observer.cc ('k') | ui/views/controls/button/custom_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698