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

Side by Side Diff: ui/views/animation/test/ink_drop_animation_controller_impl_test_api.cc

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 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_animation_controller_impl_test_api.h" 5 #include "ui/views/animation/test/ink_drop_animation_controller_impl_test_api.h"
6 6
7 #include "ui/views/animation/ink_drop_animation.h"
8 #include "ui/views/animation/ink_drop_animation_controller_impl.h" 7 #include "ui/views/animation/ink_drop_animation_controller_impl.h"
9 #include "ui/views/animation/ink_drop_hover.h" 8 #include "ui/views/animation/ink_drop_hover.h"
10 #include "ui/views/animation/test/ink_drop_animation_test_api.h" 9 #include "ui/views/animation/ink_drop_ripple.h"
11 #include "ui/views/animation/test/ink_drop_hover_test_api.h" 10 #include "ui/views/animation/test/ink_drop_hover_test_api.h"
11 #include "ui/views/animation/test/ink_drop_ripple_test_api.h"
12 12
13 namespace views { 13 namespace views {
14 namespace test { 14 namespace test {
15 15
16 InkDropAnimationControllerImplTestApi::InkDropAnimationControllerImplTestApi( 16 InkDropAnimationControllerImplTestApi::InkDropAnimationControllerImplTestApi(
17 InkDropAnimationControllerImpl* ink_drop_controller) 17 InkDropAnimationControllerImpl* ink_drop_controller)
18 : ui::test::MultiLayerAnimatorTestController(this), 18 : ui::test::MultiLayerAnimatorTestController(this),
19 ink_drop_controller_(ink_drop_controller) {} 19 ink_drop_controller_(ink_drop_controller) {}
20 20
21 InkDropAnimationControllerImplTestApi:: 21 InkDropAnimationControllerImplTestApi::
(...skipping 13 matching lines...) Expand all
35 35
36 if (ink_drop_controller_->hover_) { 36 if (ink_drop_controller_->hover_) {
37 InkDropHoverTestApi* ink_drop_hover_test_api = 37 InkDropHoverTestApi* ink_drop_hover_test_api =
38 ink_drop_controller_->hover_->GetTestApi(); 38 ink_drop_controller_->hover_->GetTestApi();
39 std::vector<ui::LayerAnimator*> ink_drop_hover_animators = 39 std::vector<ui::LayerAnimator*> ink_drop_hover_animators =
40 ink_drop_hover_test_api->GetLayerAnimators(); 40 ink_drop_hover_test_api->GetLayerAnimators();
41 animators.insert(animators.end(), ink_drop_hover_animators.begin(), 41 animators.insert(animators.end(), ink_drop_hover_animators.begin(),
42 ink_drop_hover_animators.end()); 42 ink_drop_hover_animators.end());
43 } 43 }
44 44
45 if (ink_drop_controller_->ink_drop_animation_) { 45 if (ink_drop_controller_->ink_drop_ripple_) {
46 InkDropAnimationTestApi* ink_drop_animation_test_api = 46 InkDropRippleTestApi* ink_drop_ripple_test_api =
47 ink_drop_controller_->ink_drop_animation_->GetTestApi(); 47 ink_drop_controller_->ink_drop_ripple_->GetTestApi();
48 std::vector<ui::LayerAnimator*> ink_drop_animation_animators = 48 std::vector<ui::LayerAnimator*> ink_drop_ripple_animators =
49 ink_drop_animation_test_api->GetLayerAnimators(); 49 ink_drop_ripple_test_api->GetLayerAnimators();
50 animators.insert(animators.end(), ink_drop_animation_animators.begin(), 50 animators.insert(animators.end(), ink_drop_ripple_animators.begin(),
51 ink_drop_animation_animators.end()); 51 ink_drop_ripple_animators.end());
52 } 52 }
53 53
54 return animators; 54 return animators;
55 } 55 }
56 56
57 } // namespace test 57 } // namespace test
58 } // namespace views 58 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698