Revert of Disabled ink drop animations based on gfx::Animation::ShouldRenderRichAnimation().

ui/views/animation/square_ink_drop_ripple.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/animation/square_ink_drop_ripple.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #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"
 #include "ui/gfx/geometry/vector3d_f.h"
 #include "ui/gfx/transform_util.h"
 #include "ui/views/animation/ink_drop_painted_layer_delegates.h"
 #include "ui/views/view.h"
 
 namespace {
 
@@ skipping 96 matching lines @@
     150,  // ALTERNATE_ACTION_TRIGGERED_FADE_OUT
     200,  // ALTERNATE_ACTION_TRIGGERED_TRANSFORM
     200,  // ACTIVATED_CIRCLE_TRANSFORM
     160,  // ACTIVATED_RECT_TRANSFORM
     150,  // DEACTIVATED_FADE_OUT
     200,  // DEACTIVATED_TRANSFORM
 };
 
 // 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
            : views::InkDropRipple::kSlowAnimationDurationFactor) *
       kAnimationDurationInMs[state]);
 }
 
 // Calculates a Transform for a circle layer. The transform will be set up to
 // translate by -|center_offset|, scale, and then translate to the target point
 // defined by |target_center_x| and |target_center_y|.
@@ skipping 500 matching lines @@
   layer->set_delegate(delegate);
   layer->SetVisible(true);
   layer->SetOpacity(1.0);
   layer->SetMasksToBounds(false);
   layer->set_name("PAINTED_SHAPE_COUNT:" + ToLayerName(painted_shape));
 
   painted_layers_[painted_shape].reset(layer);
 }
 
 }  // namespace views