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

Unified Diff: ui/views/animation/ink_drop_animation_controller_impl.h

Issue 1422593003: Made material design ink drop QUICK_ACTION animation more visible. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added varkha@'s behavioural changes Created 5 years, 1 month 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/animation/ink_drop_animation_controller_impl.h
diff --git a/ui/views/animation/ink_drop_animation_controller_impl.h b/ui/views/animation/ink_drop_animation_controller_impl.h
index cf50cff89b31d50a8f266a0d8a5e0a7c4f213b06..c993df1e4954871c0f749994c313105b3f462980 100644
--- a/ui/views/animation/ink_drop_animation_controller_impl.h
+++ b/ui/views/animation/ink_drop_animation_controller_impl.h
@@ -30,6 +30,7 @@ class VIEWS_EXPORT InkDropAnimationControllerImpl
// InkDropAnimationController:
InkDropState GetInkDropState() const override;
void AnimateToState(InkDropState ink_drop_state) override;
+ bool WillAutoAnimateToHidden() const override;
void SetHovered(bool is_hovered) override;
bool IsHovered() const override;
gfx::Size GetInkDropLargeSize() const override;
@@ -90,6 +91,10 @@ class VIEWS_EXPORT InkDropAnimationControllerImpl
// CreateInkDropAnimation().
scoped_ptr<InkDropAnimation> ink_drop_animation_;
+ // Tracks whether the InkDropAnimation can be destroyed when a
+ // InkDropState::HIDDEN animation completes.
+ bool can_destroy_after_hidden_animation_;
+
DISALLOW_COPY_AND_ASSIGN(InkDropAnimationControllerImpl);
};

Powered by Google App Engine
This is Rietveld 408576698