| Index: ui/views/animation/flood_fill_ink_drop_animation.h
|
| diff --git a/ui/views/animation/flood_fill_ink_drop_animation.h b/ui/views/animation/flood_fill_ink_drop_animation.h
|
| index e838e282fbf96776f7fa48896b2618a177e4f307..2449895ce343e590f965bd243bcc27cf40963fd6 100644
|
| --- a/ui/views/animation/flood_fill_ink_drop_animation.h
|
| +++ b/ui/views/animation/flood_fill_ink_drop_animation.h
|
| @@ -40,9 +40,9 @@ class FloodFillInkDropAnimationTestApi;
|
| //
|
| // {All InkDropStates} => HIDDEN
|
| // HIDDEN => ACTION_PENDING
|
| -// HIDDEN, ACTION_PENDING => QUICK_ACTION
|
| -// ACTION_PENDING => SLOW_ACTION_PENDING
|
| -// SLOW_ACTION_PENDING => SLOW_ACTION
|
| +// HIDDEN, ACTION_PENDING => ACTION_TRIGGERED
|
| +// ACTION_PENDING => ALTERNATE_ACTION_PENDING
|
| +// ALTERNATE_ACTION_PENDING => ALTERNATE_ACTION_TRIGGERED
|
| // {All InkDropStates} => ACTIVATED
|
| // {All InkDropStates} => DEACTIVATED
|
| //
|
| @@ -98,8 +98,8 @@ class VIEWS_EXPORT FloodFillInkDropAnimation : public InkDropAnimation {
|
| // |target_radius|.
|
| gfx::Transform CalculateTransform(float target_radius) const;
|
|
|
| - // Returns the target Transform for the ACTIVATED animation.
|
| - gfx::Transform GetActivatedTargetTransform() const;
|
| + // Returns the target Transform for when the ink drop is fully shown.
|
| + gfx::Transform GetMaxSizeTargetTransform() const;
|
|
|
| // The clip Size.
|
| const gfx::Size size_;
|
|
|