ui/views/animation/test/ink_drop_animation_controller_impl_test_api.cc - Issue 1937103003: Rename of InkDropAnimation classes to InkDropRipple.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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, 8 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « ui/views/animation/test/ink_drop_animation_controller_impl_test_api.h ('k') | ui/views/animation/test/ink_drop_animation_test_api.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/views/animation/test/ink_drop_animation_controller_impl_test_api.cc

diff --git a/ui/views/animation/test/ink_drop_animation_controller_impl_test_api.cc b/ui/views/animation/test/ink_drop_animation_controller_impl_test_api.cc

index a41d67c9bc655889dd0f452853229b6dd2d60667..0964396b81a7a32c7950c0a626f650ef0b72a834 100644

--- a/ui/views/animation/test/ink_drop_animation_controller_impl_test_api.cc

+++ b/ui/views/animation/test/ink_drop_animation_controller_impl_test_api.cc

@@ -4,11 +4,11 @@

#include "ui/views/animation/test/ink_drop_animation_controller_impl_test_api.h"

-#include "ui/views/animation/ink_drop_animation.h"

#include "ui/views/animation/ink_drop_animation_controller_impl.h"

#include "ui/views/animation/ink_drop_hover.h"

-#include "ui/views/animation/test/ink_drop_animation_test_api.h"

+#include "ui/views/animation/ink_drop_ripple.h"

#include "ui/views/animation/test/ink_drop_hover_test_api.h"

+#include "ui/views/animation/test/ink_drop_ripple_test_api.h"

namespace views {

namespace test {

@@ -42,13 +42,13 @@ InkDropAnimationControllerImplTestApi::GetLayerAnimators() {

ink_drop_hover_animators.end());

}

- if (ink_drop_controller_->ink_drop_animation_) {

- InkDropAnimationTestApi* ink_drop_animation_test_api =

- ink_drop_controller_->ink_drop_animation_->GetTestApi();

- std::vector<ui::LayerAnimator*> ink_drop_animation_animators =

- ink_drop_animation_test_api->GetLayerAnimators();

- animators.insert(animators.end(), ink_drop_animation_animators.begin(),

- ink_drop_animation_animators.end());

+ if (ink_drop_controller_->ink_drop_ripple_) {

+ InkDropRippleTestApi* ink_drop_ripple_test_api =

+ ink_drop_controller_->ink_drop_ripple_->GetTestApi();

+ std::vector<ui::LayerAnimator*> ink_drop_ripple_animators =

+ ink_drop_ripple_test_api->GetLayerAnimators();

+ animators.insert(animators.end(), ink_drop_ripple_animators.begin(),

+ ink_drop_ripple_animators.end());

}

return animators;