| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/common/shell_window_ids.h" | 5 #include "ash/shared/shell_window_ids.h" |
| 6 #include "ash/shell.h" | 6 #include "ash/shell.h" |
| 7 #include "ash/test/ash_test_base.h" | 7 #include "ash/test/ash_test_base.h" |
| 8 #include "ash/wm/session_state_animator.h" | 8 #include "ash/wm/session_state_animator.h" |
| 9 #include "ash/wm/session_state_animator_impl.h" | 9 #include "ash/wm/session_state_animator_impl.h" |
| 10 #include "ui/aura/client/aura_constants.h" | 10 #include "ui/aura/client/aura_constants.h" |
| 11 | 11 |
| 12 typedef ash::test::AshTestBase SessionStateAnimatiorImplContainersTest; | 12 typedef ash::test::AshTestBase SessionStateAnimatiorImplContainersTest; |
| 13 | 13 |
| 14 namespace ash { | 14 namespace ash { |
| 15 namespace { | 15 namespace { |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 74 SessionStateAnimator::LOCK_SCREEN_RELATED_CONTAINERS, &containers); | 74 SessionStateAnimator::LOCK_SCREEN_RELATED_CONTAINERS, &containers); |
| 75 EXPECT_TRUE(ContainersHaveWindowWithId( | 75 EXPECT_TRUE(ContainersHaveWindowWithId( |
| 76 containers, kShellWindowId_LockScreenRelatedContainersContainer)); | 76 containers, kShellWindowId_LockScreenRelatedContainersContainer)); |
| 77 | 77 |
| 78 // Empty mask should clear the container. | 78 // Empty mask should clear the container. |
| 79 SessionStateAnimatorImpl::GetContainers(0, &containers); | 79 SessionStateAnimatorImpl::GetContainers(0, &containers); |
| 80 EXPECT_TRUE(containers.empty()); | 80 EXPECT_TRUE(containers.empty()); |
| 81 } | 81 } |
| 82 | 82 |
| 83 } // namespace ash | 83 } // namespace ash |
| OLD | NEW |