Index: ui/views/animation/ink_drop_impl.cc |
diff --git a/ui/views/animation/ink_drop_impl.cc b/ui/views/animation/ink_drop_impl.cc |
index d5a4d8a3ec5e54a7b6f6ffb1a79c1dc4698792da..fdcb40c5094f4eb104f21fadce791b84192884b2 100644 |
--- a/ui/views/animation/ink_drop_impl.cc |
+++ b/ui/views/animation/ink_drop_impl.cc |
@@ -667,6 +667,11 @@ void InkDropImpl::SetFocused(bool is_focused) { |
highlight_state_->OnFocusChanged(); |
} |
+bool InkDropImpl::ShouldHighlight() const { |
+ return ShouldHighlightBasedOnFocus() || |
+ (show_highlight_on_hover_ && is_hovered_); |
+} |
+ |
void InkDropImpl::DestroyHiddenTargetedAnimations() { |
if (ink_drop_ripple_ && |
(ink_drop_ripple_->target_ink_drop_state() == InkDropState::HIDDEN || |
@@ -742,6 +747,7 @@ bool InkDropImpl::IsHighlightFadingInOrVisible() const { |
void InkDropImpl::AnimationStarted(InkDropState ink_drop_state) { |
highlight_state_->AnimationStarted(ink_drop_state); |
+ ink_drop_host_->InkDropAnimationStarted(); |
} |
void InkDropImpl::AnimationEnded(InkDropState ink_drop_state, |
@@ -766,7 +772,9 @@ void InkDropImpl::AnimationEnded(InkDropState ink_drop_state, |
// views::InkDropHighlightObserver: |
void InkDropImpl::AnimationStarted( |
- InkDropHighlight::AnimationType animation_type) {} |
+ InkDropHighlight::AnimationType animation_type) { |
+ ink_drop_host_->InkDropAnimationStarted(); |
+} |
void InkDropImpl::AnimationEnded(InkDropHighlight::AnimationType animation_type, |
InkDropAnimationEndedReason reason) { |
@@ -793,11 +801,6 @@ void InkDropImpl::SetHighlight(bool should_highlight, |
} |
} |
-bool InkDropImpl::ShouldHighlight() const { |
- return ShouldHighlightBasedOnFocus() || |
- (show_highlight_on_hover_ && is_hovered_); |
-} |
- |
bool InkDropImpl::ShouldHighlightBasedOnFocus() const { |
return show_highlight_on_focus_ && is_focused_; |
} |