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

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

Issue 2033553003: Add MD ink drop ripple to shelf app items (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added tests 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
Index: ui/views/controls/button/custom_button.cc
diff --git a/ui/views/controls/button/custom_button.cc b/ui/views/controls/button/custom_button.cc
index 2875b06fcf05582b9e28ea9af5c6f8f4bda53556..910f3c64c838e591abf53a5f4e11f5165c127a40 100644
--- a/ui/views/controls/button/custom_button.cc
+++ b/ui/views/controls/button/custom_button.cc
@@ -408,7 +408,6 @@ CustomButton::CustomButton(ButtonListener* listener)
request_focus_on_press_(false),
notify_action_(NOTIFY_ON_RELEASE),
has_ink_drop_action_on_click_(false),
- ink_drop_action_on_click_(InkDropState::ACTION_TRIGGERED),
hide_ink_drop_when_showing_context_menu_(true),
ink_drop_base_color_(gfx::kPlaceholderColor) {
hover_animation_.SetSlideDuration(kHoverFadeDurationMs);
@@ -462,7 +461,7 @@ bool CustomButton::ShouldEnterHoveredState() {
void CustomButton::NotifyClick(const ui::Event& event) {
if (has_ink_drop_action_on_click_)
- AnimateInkDrop(ink_drop_action_on_click_);
+ AnimateInkDrop(InkDropState::ACTION_TRIGGERED);
Button::NotifyClick(event);
}

Powered by Google App Engine
This is Rietveld 408576698