| 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 "ash/wm/visibility_controller.h" | 5 #include "ash/wm/visibility_controller.h" |
| 6 | 6 |
| 7 #include "ash/test/ash_test_base.h" | 7 #include "ash/test/ash_test_base.h" |
| 8 #include "ui/aura/test/test_window_delegate.h" |
| 8 #include "ui/aura/test/test_windows.h" | 9 #include "ui/aura/test/test_windows.h" |
| 9 #include "ui/aura/test/test_window_delegate.h" | |
| 10 #include "ui/aura/window.h" | 10 #include "ui/aura/window.h" |
| 11 #include "ui/gfx/compositor/layer.h" | 11 #include "ui/compositor/layer.h" |
| 12 #include "ui/gfx/compositor/layer_animator.h" | 12 #include "ui/compositor/layer_animator.h" |
| 13 | 13 |
| 14 namespace ash { | 14 namespace ash { |
| 15 namespace internal { | 15 namespace internal { |
| 16 | 16 |
| 17 typedef test::AshTestBase VisibilityControllerTest; | 17 typedef test::AshTestBase VisibilityControllerTest; |
| 18 | 18 |
| 19 // Hiding a window in an animatable container should not hide the window's layer | 19 // Hiding a window in an animatable container should not hide the window's layer |
| 20 // immediately. | 20 // immediately. |
| 21 TEST_F(VisibilityControllerTest, AnimateHideDoesntHideWindowLayer) { | 21 TEST_F(VisibilityControllerTest, AnimateHideDoesntHideWindowLayer) { |
| 22 // We cannot disable animations for this test. | 22 // We cannot disable animations for this test. |
| (...skipping 19 matching lines...) Expand all Loading... |
| 42 | 42 |
| 43 EXPECT_TRUE(non_animatable->IsVisible()); | 43 EXPECT_TRUE(non_animatable->IsVisible()); |
| 44 EXPECT_TRUE(non_animatable->layer()->visible()); | 44 EXPECT_TRUE(non_animatable->layer()->visible()); |
| 45 non_animatable->Hide(); | 45 non_animatable->Hide(); |
| 46 EXPECT_FALSE(non_animatable->IsVisible()); | 46 EXPECT_FALSE(non_animatable->IsVisible()); |
| 47 EXPECT_FALSE(non_animatable->layer()->visible()); | 47 EXPECT_FALSE(non_animatable->layer()->visible()); |
| 48 } | 48 } |
| 49 | 49 |
| 50 } // namespace internal | 50 } // namespace internal |
| 51 } // namespace ash | 51 } // namespace ash |
| OLD | NEW |