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

ui/views/animation/flood_fill_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/flood_fill_ink_drop_ripple.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "third_party/skia/include/core/SkColor.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/point_conversions.h"
 #include "ui/gfx/geometry/vector2d_f.h"
 
 namespace {
 
 // The minimum radius to use when scaling the painted layers. Smaller values
 // were causing visual anomalies.
 const float kMinRadius = 1.f;
 
 // All the sub animations that are used to animate each of the InkDropStates.
@@ skipping 64 matching lines @@
     300,  // ACTION_TRIGGERED_FADE_OUT
     200,  // ALTERNATE_ACTION_PENDING
     300,  // ALTERNATE_ACTION_TRIGGERED_FADE_OUT
     150,  // ACTIVATED_FADE_IN
     200,  // ACTIVATED_TRANSFORM
     300,  // DEACTIVATED_FADE_OUT
 };
 
 // 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]);
 }
 
 }  // namespace
 
 namespace views {
@@ skipping 221 matching lines @@
       (bounds.bottom_right() - point).Length();
 
   float largest_distance =
       std::max(distance_to_top_left, distance_to_top_right);
   largest_distance = std::max(largest_distance, distance_to_bottom_left);
   largest_distance = std::max(largest_distance, distance_to_bottom_right);
   return largest_distance;
 }
 
 }  // namespace views