| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ui/views/animation/test/ink_drop_hover_test_api.h" | 5 #include "ui/views/animation/test/ink_drop_highlight_test_api.h" |
| 6 | 6 |
| 7 #include "base/time/time.h" | 7 #include "base/time/time.h" |
| 8 #include "ui/compositor/layer.h" | 8 #include "ui/compositor/layer.h" |
| 9 #include "ui/compositor/layer_animator.h" | 9 #include "ui/compositor/layer_animator.h" |
| 10 #include "ui/compositor/test/layer_animator_test_controller.h" | 10 #include "ui/compositor/test/layer_animator_test_controller.h" |
| 11 #include "ui/views/animation/ink_drop_hover.h" | 11 #include "ui/views/animation/ink_drop_highlight.h" |
| 12 | 12 |
| 13 namespace views { | 13 namespace views { |
| 14 namespace test { | 14 namespace test { |
| 15 | 15 |
| 16 InkDropHoverTestApi::InkDropHoverTestApi(InkDropHover* ink_drop_hover) | 16 InkDropHighlightTestApi::InkDropHighlightTestApi( |
| 17 InkDropHighlight* ink_drop_highlight) |
| 17 : ui::test::MultiLayerAnimatorTestController(this), | 18 : ui::test::MultiLayerAnimatorTestController(this), |
| 18 ink_drop_hover_(ink_drop_hover) {} | 19 ink_drop_highlight_(ink_drop_highlight) {} |
| 19 | 20 |
| 20 InkDropHoverTestApi::~InkDropHoverTestApi() {} | 21 InkDropHighlightTestApi::~InkDropHighlightTestApi() {} |
| 21 | 22 |
| 22 std::vector<ui::LayerAnimator*> InkDropHoverTestApi::GetLayerAnimators() { | 23 std::vector<ui::LayerAnimator*> InkDropHighlightTestApi::GetLayerAnimators() { |
| 23 std::vector<ui::LayerAnimator*> animators; | 24 std::vector<ui::LayerAnimator*> animators; |
| 24 animators.push_back(ink_drop_hover()->layer_->GetAnimator()); | 25 animators.push_back(ink_drop_highlight()->layer_->GetAnimator()); |
| 25 return animators; | 26 return animators; |
| 26 } | 27 } |
| 27 | 28 |
| 28 } // namespace test | 29 } // namespace test |
| 29 } // namespace views | 30 } // namespace views |
| OLD | NEW |