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

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

Issue 1944043002: Enabled tests to control material design ink drop animations. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2704
Patch Set: Replaced unique_ptr with scoped_ptr. 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/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
new file mode 100644
index 0000000000000000000000000000000000000000..a41d67c9bc655889dd0f452853229b6dd2d60667
--- /dev/null
+++ b/ui/views/animation/test/ink_drop_animation_controller_impl_test_api.cc
@@ -0,0 +1,58 @@
+// 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.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/test/ink_drop_hover_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_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());
+ }
+
+ return animators;
+}
+
+} // namespace test
+} // namespace views

Powered by Google App Engine
This is Rietveld 408576698