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

Unified Diff: ui/views/animation/test/square_ink_drop_animation_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
Index: ui/views/animation/test/square_ink_drop_animation_test_api.cc
diff --git a/ui/views/animation/test/square_ink_drop_animation_test_api.cc b/ui/views/animation/test/square_ink_drop_animation_test_api.cc
deleted file mode 100644
index e098aa075bbb2ed054ea5d883b0f8ced19db0fa4..0000000000000000000000000000000000000000
--- a/ui/views/animation/test/square_ink_drop_animation_test_api.cc
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2015 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/square_ink_drop_animation_test_api.h"
-
-#include <vector>
-
-#include "base/time/time.h"
-#include "ui/compositor/layer.h"
-#include "ui/compositor/layer_animator.h"
-#include "ui/compositor/test/layer_animator_test_controller.h"
-#include "ui/views/animation/ink_drop_animation.h"
-
-namespace views {
-namespace test {
-
-SquareInkDropAnimationTestApi::SquareInkDropAnimationTestApi(
- SquareInkDropAnimation* ink_drop_animation)
- : InkDropAnimationTestApi(ink_drop_animation) {}
-
-SquareInkDropAnimationTestApi::~SquareInkDropAnimationTestApi() {}
-
-void SquareInkDropAnimationTestApi::CalculateCircleTransforms(
- const gfx::Size& size,
- InkDropTransforms* transforms_out) const {
- ink_drop_animation()->CalculateCircleTransforms(size, transforms_out);
-}
-void SquareInkDropAnimationTestApi::CalculateRectTransforms(
- const gfx::Size& size,
- float corner_radius,
- InkDropTransforms* transforms_out) const {
- ink_drop_animation()->CalculateRectTransforms(size, corner_radius,
- transforms_out);
-}
-
-float SquareInkDropAnimationTestApi::GetCurrentOpacity() const {
- return ink_drop_animation()->GetCurrentOpacity();
-}
-
-std::vector<ui::LayerAnimator*>
-SquareInkDropAnimationTestApi::GetLayerAnimators() {
- std::vector<ui::LayerAnimator*> animators =
- InkDropAnimationTestApi::GetLayerAnimators();
- animators.push_back(ink_drop_animation()->GetRootLayer()->GetAnimator());
- for (int i = 0; i < SquareInkDropAnimation::PAINTED_SHAPE_COUNT; ++i)
- animators.push_back(
- ink_drop_animation()->painted_layers_[i]->GetAnimator());
- return animators;
-}
-
-} // namespace test
-} // namespace views

Powered by Google App Engine
This is Rietveld 408576698