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

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

Issue 1682893002: Color the ink drop ripple and hover effects based on theming. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix unit tests Created 4 years, 10 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/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 9b3f6784b745e57098e07ab782b61782f1517e65..ac40e6449c532be44090c54c75d8914403aca6a1 100644
--- a/ui/views/animation/ink_drop_animation_controller_impl.h
+++ b/ui/views/animation/ink_drop_animation_controller_impl.h
@@ -39,7 +39,6 @@ class VIEWS_EXPORT InkDropAnimationControllerImpl
void AnimateToState(InkDropState ink_drop_state) override;
void SetHovered(bool is_hovered) override;
bool IsHovered() const override;
- gfx::Size GetInkDropLargeSize() const override;
void SetInkDropSize(const gfx::Size& large_size,
int large_corner_radius,
const gfx::Size& small_size,
@@ -53,14 +52,14 @@ class VIEWS_EXPORT InkDropAnimationControllerImpl
// Creates a new InkDropAnimation and sets it to |ink_drop_animation_|. If
// |ink_drop_animation_| wasn't null then it will be destroyed using
// DestroyInkDropAnimation().
- void CreateInkDropAnimation();
+ void EnsureInkDropAnimation();
// Destroys the current |ink_drop_animation_|.
void DestroyInkDropAnimation();
// Creates a new InkDropHover and sets it to |hover_|. If |hover_| wasn't null
// then it will be destroyed using DestroyInkDropHover().
- void CreateInkDropHover();
+ void EnsureInkDropHover();
// Destroys the current |hover_|.
void DestroyInkDropHover();
@@ -109,11 +108,11 @@ class VIEWS_EXPORT InkDropAnimationControllerImpl
// from the InkDropHost.
scoped_ptr<ui::Layer> root_layer_;
- // The current InkDropHover. Lazily created using CreateInkDropHover();
+ // The current InkDropHover. Lazily created using EnsureInkDropHover();
scoped_ptr<InkDropHover> hover_;
// The current InkDropAnimation. Created on demand using
- // CreateInkDropAnimation().
+ // EnsureInkDropAnimation().
scoped_ptr<SquareInkDropAnimation> ink_drop_animation_;
// Tracks whether the InkDropAnimation can safely be destroyed when an

Powered by Google App Engine
This is Rietveld 408576698