Made material design ink drop QUICK_ACTION animation more visible.

ui/views/animation/ink_drop_animation_controller_factory.cc

 // Copyright 2015 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/ink_drop_animation_controller_factory.h"
 
 #include "ui/base/resource/material_design/material_design_controller.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/views/animation/ink_drop_animation_controller.h"
 #include "ui/views/animation/ink_drop_animation_controller_impl.h"
 #include "ui/views/views_export.h"
 
 namespace views {
 
 namespace {
 
 // A stub implementation of an InkDropAnimationController that can be used when
 // material design is not enabled.
 class InkDropAnimationControllerStub
     : public InkDropAnimationController {
  public:
   explicit InkDropAnimationControllerStub();
   ~InkDropAnimationControllerStub() override;
 
   // InkDropAnimationController:
   InkDropState GetInkDropState() const override;
   void AnimateToState(InkDropState state) override;
+  bool WillAutoAnimateToHidden() const override;
+  void SetHovered(bool is_hovered) override;
+  bool IsHovered() const override;
   gfx::Size GetInkDropLargeSize() const override;
   void SetInkDropSize(const gfx::Size& large_size,
                       int large_corner_radius,
                       const gfx::Size& small_size,
                       int small_corner_radius) override;
   void SetInkDropCenter(const gfx::Point& center_point) override;
 
  private:
+  // Tracks whether the ink drop is hovered or not. This is used to ensure that
+  // this behaves like all other InkDropAnimationController implementations.
+  bool is_hovered_;
+
   DISALLOW_COPY_AND_ASSIGN(InkDropAnimationControllerStub);
 };
 
-InkDropAnimationControllerStub::InkDropAnimationControllerStub() {}
+InkDropAnimationControllerStub::InkDropAnimationControllerStub()
+    : is_hovered_(false) {}
 
 InkDropAnimationControllerStub::~InkDropAnimationControllerStub() {}
 
 InkDropState InkDropAnimationControllerStub::GetInkDropState() const {
   return InkDropState::HIDDEN;
 }
 
-void InkDropAnimationControllerStub::AnimateToState(InkDropState state) {}
+void InkDropAnimationControllerStub::AnimateToState(InkDropState state) {
+  SetHovered(false);
+}
+
+bool InkDropAnimationControllerStub::WillAutoAnimateToHidden() const {
+  return false;
+}
+
+void InkDropAnimationControllerStub::SetHovered(bool is_hovered) {
+  is_hovered_ = is_hovered;
+}
+
+bool InkDropAnimationControllerStub::IsHovered() const {
+  return is_hovered_;
+}
 
 gfx::Size InkDropAnimationControllerStub::GetInkDropLargeSize() const {
   return gfx::Size();
 }
 
 void InkDropAnimationControllerStub::SetInkDropSize(const gfx::Size& large_size,
                                                     int large_corner_radius,
                                                     const gfx::Size& small_size,
                                                     int small_corner_radius) {}
 
 void InkDropAnimationControllerStub::SetInkDropCenter(
     const gfx::Point& center_point) {}
 
 }  // namespace
 
 InkDropAnimationControllerFactory::InkDropAnimationControllerFactory() {}
 
 InkDropAnimationControllerFactory::~InkDropAnimationControllerFactory() {}
 
 scoped_ptr<InkDropAnimationController>
 InkDropAnimationControllerFactory::CreateInkDropAnimationController(
-    InkDropHost* ink_drop_host) {
+    InkDropHost* ink_drop_host,
+    InkDropConsumer* ink_drop_consumer) {
   if (ui::MaterialDesignController::IsModeMaterial()) {
     return scoped_ptr<InkDropAnimationController>(
-        new InkDropAnimationControllerImpl(ink_drop_host));
+        new InkDropAnimationControllerImpl(ink_drop_host, ink_drop_consumer));
   }
 
   return scoped_ptr<InkDropAnimationController>(
       new InkDropAnimationControllerStub());
 }
 
 }  // namespace views