| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 #ifndef UI_VIEWS_ANIMATION_TEST_INK_DROP_ANIMATION_TEST_API_H_ | 5 #ifndef UI_VIEWS_ANIMATION_TEST_INK_DROP_ANIMATION_TEST_API_H_ |
| 6 #define UI_VIEWS_ANIMATION_TEST_INK_DROP_ANIMATION_TEST_API_H_ | 6 #define UI_VIEWS_ANIMATION_TEST_INK_DROP_ANIMATION_TEST_API_H_ |
| 7 | 7 |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| 11 #include "base/time/time.h" | |
| 12 #include "ui/compositor/test/multi_layer_animator_test_controller.h" | 11 #include "ui/compositor/test/multi_layer_animator_test_controller.h" |
| 13 #include "ui/compositor/test/multi_layer_animator_test_controller_delegate.h" | 12 #include "ui/compositor/test/multi_layer_animator_test_controller_delegate.h" |
| 14 | 13 |
| 15 namespace ui { | 14 namespace ui { |
| 16 class LayerAnimator; | 15 class LayerAnimator; |
| 17 } // namespace ui | 16 } // namespace ui |
| 18 | 17 |
| 19 namespace views { | 18 namespace views { |
| 20 class InkDropAnimation; | 19 class InkDropAnimation; |
| 21 | 20 |
| (...skipping 27 matching lines...) Expand all Loading... |
| 49 // The InkDropedAnimation to provide internal access to. | 48 // The InkDropedAnimation to provide internal access to. |
| 50 InkDropAnimation* ink_drop_animation_; | 49 InkDropAnimation* ink_drop_animation_; |
| 51 | 50 |
| 52 DISALLOW_COPY_AND_ASSIGN(InkDropAnimationTestApi); | 51 DISALLOW_COPY_AND_ASSIGN(InkDropAnimationTestApi); |
| 53 }; | 52 }; |
| 54 | 53 |
| 55 } // namespace test | 54 } // namespace test |
| 56 } // namespace views | 55 } // namespace views |
| 57 | 56 |
| 58 #endif // UI_VIEWS_ANIMATION_TEST_INK_DROP_ANIMATION_TEST_API_H_ | 57 #endif // UI_VIEWS_ANIMATION_TEST_INK_DROP_ANIMATION_TEST_API_H_ |
| OLD | NEW |