| Index: ui/views/animation/test/ink_drop_impl_test_api.cc
|
| diff --git a/ui/views/animation/test/ink_drop_impl_test_api.cc b/ui/views/animation/test/ink_drop_impl_test_api.cc
|
| index e0b15fbf9ca616a39d9be120bc03df870a7e48e3..d35363d5bd54c99172f8427a8b04a1a14fd1c23b 100644
|
| --- a/ui/views/animation/test/ink_drop_impl_test_api.cc
|
| +++ b/ui/views/animation/test/ink_drop_impl_test_api.cc
|
| @@ -4,10 +4,10 @@
|
|
|
| #include "ui/views/animation/test/ink_drop_impl_test_api.h"
|
|
|
| -#include "ui/views/animation/ink_drop_hover.h"
|
| +#include "ui/views/animation/ink_drop_highlight.h"
|
| #include "ui/views/animation/ink_drop_impl.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_highlight_test_api.h"
|
| #include "ui/views/animation/test/ink_drop_ripple_test_api.h"
|
|
|
| namespace views {
|
| @@ -18,24 +18,24 @@ InkDropImplTestApi::InkDropImplTestApi(InkDropImpl* ink_drop)
|
|
|
| InkDropImplTestApi::~InkDropImplTestApi() {}
|
|
|
| -const InkDropHover* InkDropImplTestApi::hover() const {
|
| - return ink_drop_->hover_.get();
|
| +const InkDropHighlight* InkDropImplTestApi::highlight() const {
|
| + return ink_drop_->highlight_.get();
|
| }
|
|
|
| -bool InkDropImplTestApi::IsHoverFadingInOrVisible() const {
|
| - return ink_drop_->IsHoverFadingInOrVisible();
|
| +bool InkDropImplTestApi::IsHighlightFadingInOrVisible() const {
|
| + return ink_drop_->IsHighlightFadingInOrVisible();
|
| }
|
|
|
| std::vector<ui::LayerAnimator*> InkDropImplTestApi::GetLayerAnimators() {
|
| std::vector<ui::LayerAnimator*> animators;
|
|
|
| - if (ink_drop_->hover_) {
|
| - InkDropHoverTestApi* ink_drop_hover_test_api =
|
| - ink_drop_->hover_->GetTestApi();
|
| - std::vector<ui::LayerAnimator*> ink_drop_hover_animators =
|
| - ink_drop_hover_test_api->GetLayerAnimators();
|
| - animators.insert(animators.end(), ink_drop_hover_animators.begin(),
|
| - ink_drop_hover_animators.end());
|
| + if (ink_drop_->highlight_) {
|
| + InkDropHighlightTestApi* ink_drop_highlight_test_api =
|
| + ink_drop_->highlight_->GetTestApi();
|
| + std::vector<ui::LayerAnimator*> ink_drop_highlight_animators =
|
| + ink_drop_highlight_test_api->GetLayerAnimators();
|
| + animators.insert(animators.end(), ink_drop_highlight_animators.begin(),
|
| + ink_drop_highlight_animators.end());
|
| }
|
|
|
| if (ink_drop_->ink_drop_ripple_) {
|
|
|