| 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 ff29f9f86b08164fe22fad4fecef664e4d2ee655..40eb0ba426ebe0a61ead82c4dbf303ef4a0ec6c2 100644
|
| --- a/ui/views/animation/ink_drop_animation_controller_impl.h
|
| +++ b/ui/views/animation/ink_drop_animation_controller_impl.h
|
| @@ -115,6 +115,10 @@ class VIEWS_EXPORT InkDropAnimationControllerImpl
|
| // CreateInkDropAnimation().
|
| scoped_ptr<InkDropAnimation> ink_drop_animation_;
|
|
|
| + // Tracks whether the InkDropAnimation can safely be destroyed when an
|
| + // InkDropState::HIDDEN animation completes.
|
| + bool can_destroy_after_hidden_animation_;
|
| +
|
| // The timer used to delay the hover fade in after an ink drop animation.
|
| scoped_ptr<base::Timer> hover_after_animation_timer_;
|
|
|
|
|