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

Unified Diff: ui/views/animation/test/ink_drop_animation_controller_impl_test_api.cc

Issue 1963193002: Ink Drop cleanup. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed tdanderson@ nit from patch set 1. 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 side-by-side diff with in-line comments
Download patch
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
deleted file mode 100644
index 0964396b81a7a32c7950c0a626f650ef0b72a834..0000000000000000000000000000000000000000
--- a/ui/views/animation/test/ink_drop_animation_controller_impl_test_api.cc
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright 2016 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "ui/views/animation/test/ink_drop_animation_controller_impl_test_api.h"
-
-#include "ui/views/animation/ink_drop_animation_controller_impl.h"
-#include "ui/views/animation/ink_drop_hover.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 {
-
-InkDropAnimationControllerImplTestApi::InkDropAnimationControllerImplTestApi(
- InkDropAnimationControllerImpl* ink_drop_controller)
- : ui::test::MultiLayerAnimatorTestController(this),
- ink_drop_controller_(ink_drop_controller) {}
-
-InkDropAnimationControllerImplTestApi::
- ~InkDropAnimationControllerImplTestApi() {}
-
-const InkDropHover* InkDropAnimationControllerImplTestApi::hover() const {
- return ink_drop_controller_->hover_.get();
-}
-
-bool InkDropAnimationControllerImplTestApi::IsHoverFadingInOrVisible() const {
- return ink_drop_controller_->IsHoverFadingInOrVisible();
-}
-
-std::vector<ui::LayerAnimator*>
-InkDropAnimationControllerImplTestApi::GetLayerAnimators() {
- std::vector<ui::LayerAnimator*> animators;
-
- if (ink_drop_controller_->hover_) {
- InkDropHoverTestApi* ink_drop_hover_test_api =
- ink_drop_controller_->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_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;
-}
-
-} // namespace test
-} // namespace views

Powered by Google App Engine
This is Rietveld 408576698