| Index: ui/views/animation/square_ink_drop_ripple.cc
|
| diff --git a/ui/views/animation/square_ink_drop_ripple.cc b/ui/views/animation/square_ink_drop_ripple.cc
|
| index 80fe47cc42751bc63afa1defbac7ac8354825371..ffa339e3f815beab4c1e24418b6972a00ae508f7 100644
|
| --- a/ui/views/animation/square_ink_drop_ripple.cc
|
| +++ b/ui/views/animation/square_ink_drop_ripple.cc
|
| @@ -10,7 +10,6 @@
|
| #include "ui/compositor/layer.h"
|
| #include "ui/compositor/layer_animation_sequence.h"
|
| #include "ui/compositor/scoped_layer_animation_settings.h"
|
| -#include "ui/gfx/animation/animation.h"
|
| #include "ui/gfx/geometry/point3_f.h"
|
| #include "ui/gfx/geometry/point_conversions.h"
|
| #include "ui/gfx/geometry/point_f.h"
|
| @@ -127,10 +126,6 @@
|
|
|
| // Returns the InkDropState sub animation duration for the given |state|.
|
| base::TimeDelta GetAnimationDuration(InkDropSubAnimations state) {
|
| - // Ink drop animations are controlled by the system animation settings for
|
| - // accessibility reasons."See https://crbug.com/658384.
|
| - if (!gfx::Animation::ShouldRenderRichAnimation())
|
| - return base::TimeDelta();
|
| return base::TimeDelta::FromMilliseconds(
|
| (views::InkDropRipple::UseFastAnimations()
|
| ? 1
|
|
|