Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(916)

Side by Side Diff: ui/views/animation/test/ink_drop_ripple_test_api.h

Issue 1937103003: Rename of InkDropAnimation classes to InkDropRipple. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed test_ink_drop_animation_observer.h from views.gyp and doc update. Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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_RIPPLE_TEST_API_H_
6 #define UI_VIEWS_ANIMATION_TEST_INK_DROP_ANIMATION_TEST_API_H_ 6 #define UI_VIEWS_ANIMATION_TEST_INK_DROP_RIPPLE_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 "ui/compositor/test/multi_layer_animator_test_controller.h" 11 #include "ui/compositor/test/multi_layer_animator_test_controller.h"
12 #include "ui/compositor/test/multi_layer_animator_test_controller_delegate.h" 12 #include "ui/compositor/test/multi_layer_animator_test_controller_delegate.h"
13 13
14 namespace ui { 14 namespace ui {
15 class LayerAnimator; 15 class LayerAnimator;
16 } // namespace ui 16 } // namespace ui
17 17
18 namespace views { 18 namespace views {
19 class InkDropAnimation; 19 class InkDropRipple;
20 20
21 namespace test { 21 namespace test {
22 22
23 // Test API to provide internal access to an InkDropAnimation instance. This can 23 // Test API to provide internal access to an InkDropRipple instance. This can
24 // also be used to control the animations via the 24 // also be used to control the animations via the
25 // ui::test::MultiLayerAnimatorTestController API. 25 // ui::test::MultiLayerAnimatorTestController API.
26 class InkDropAnimationTestApi 26 class InkDropRippleTestApi
27 : public ui::test::MultiLayerAnimatorTestController, 27 : public ui::test::MultiLayerAnimatorTestController,
28 public ui::test::MultiLayerAnimatorTestControllerDelegate { 28 public ui::test::MultiLayerAnimatorTestControllerDelegate {
29 public: 29 public:
30 explicit InkDropAnimationTestApi(InkDropAnimation* ink_drop_animation); 30 explicit InkDropRippleTestApi(InkDropRipple* ink_drop_ripple);
31 ~InkDropAnimationTestApi() override; 31 ~InkDropRippleTestApi() override;
32 32
33 // Gets the opacity of the ink drop. 33 // Gets the opacity of the ink drop.
34 virtual float GetCurrentOpacity() const = 0; 34 virtual float GetCurrentOpacity() const = 0;
35 35
36 // MultiLayerAnimatorTestControllerDelegate: 36 // MultiLayerAnimatorTestControllerDelegate:
37 std::vector<ui::LayerAnimator*> GetLayerAnimators() override; 37 std::vector<ui::LayerAnimator*> GetLayerAnimators() override;
38 38
39 protected: 39 protected:
40 InkDropAnimation* ink_drop_animation() { 40 InkDropRipple* ink_drop_ripple() {
41 return static_cast<const InkDropAnimationTestApi*>(this) 41 return static_cast<const InkDropRippleTestApi*>(this)->ink_drop_ripple();
42 ->ink_drop_animation();
43 } 42 }
44 43
45 InkDropAnimation* ink_drop_animation() const { return ink_drop_animation_; } 44 InkDropRipple* ink_drop_ripple() const { return ink_drop_ripple_; }
46 45
47 private: 46 private:
48 // The InkDropedAnimation to provide internal access to. 47 // The InkDropedRipple to provide internal access to.
49 InkDropAnimation* ink_drop_animation_; 48 InkDropRipple* ink_drop_ripple_;
50 49
51 DISALLOW_COPY_AND_ASSIGN(InkDropAnimationTestApi); 50 DISALLOW_COPY_AND_ASSIGN(InkDropRippleTestApi);
52 }; 51 };
53 52
54 } // namespace test 53 } // namespace test
55 } // namespace views 54 } // namespace views
56 55
57 #endif // UI_VIEWS_ANIMATION_TEST_INK_DROP_ANIMATION_TEST_API_H_ 56 #endif // UI_VIEWS_ANIMATION_TEST_INK_DROP_RIPPLE_TEST_API_H_
OLDNEW
« no previous file with comments | « ui/views/animation/test/ink_drop_animation_test_api.cc ('k') | ui/views/animation/test/ink_drop_ripple_test_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698