OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "ui/views/corewm/window_animations.h" | 5 #include "ui/views/corewm/window_animations.h" |
6 | 6 |
7 #include "base/time/time.h" | 7 #include "base/time/time.h" |
8 #include "ui/aura/client/animation_host.h" | 8 #include "ui/aura/client/animation_host.h" |
9 #include "ui/aura/test/aura_test_base.h" | 9 #include "ui/aura/test/aura_test_base.h" |
10 #include "ui/aura/test/test_windows.h" | 10 #include "ui/aura/test/test_windows.h" |
11 #include "ui/aura/window.h" | 11 #include "ui/aura/window.h" |
12 #include "ui/base/animation/animation_container_element.h" | |
13 #include "ui/compositor/layer.h" | 12 #include "ui/compositor/layer.h" |
14 #include "ui/compositor/layer_animator.h" | 13 #include "ui/compositor/layer_animator.h" |
15 #include "ui/compositor/scoped_animation_duration_scale_mode.h" | 14 #include "ui/compositor/scoped_animation_duration_scale_mode.h" |
| 15 #include "ui/gfx/animation/animation_container_element.h" |
16 | 16 |
17 using aura::Window; | 17 using aura::Window; |
18 using ui::Layer; | 18 using ui::Layer; |
19 | 19 |
20 namespace views { | 20 namespace views { |
21 namespace corewm { | 21 namespace corewm { |
22 | 22 |
23 class WindowAnimationsTest : public aura::test::AuraTestBase { | 23 class WindowAnimationsTest : public aura::test::AuraTestBase { |
24 public: | 24 public: |
25 WindowAnimationsTest() {} | 25 WindowAnimationsTest() {} |
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
131 AnimateOnChildWindowVisibilityChanged(window.get(), true); | 131 AnimateOnChildWindowVisibilityChanged(window.get(), true); |
132 EXPECT_TRUE(window->layer()->visible()); | 132 EXPECT_TRUE(window->layer()->visible()); |
133 | 133 |
134 EXPECT_FALSE(animation_host.hide_completed()); | 134 EXPECT_FALSE(animation_host.hide_completed()); |
135 AnimateOnChildWindowVisibilityChanged(window.get(), false); | 135 AnimateOnChildWindowVisibilityChanged(window.get(), false); |
136 EXPECT_TRUE(animation_host.hide_completed()); | 136 EXPECT_TRUE(animation_host.hide_completed()); |
137 } | 137 } |
138 | 138 |
139 } // namespace corewm | 139 } // namespace corewm |
140 } // namespace views | 140 } // namespace views |
OLD | NEW |