| 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/window_cycle_controller.h" | 5 #include "ash/wm/window_cycle_controller.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "ash/shell.h" | 9 #include "ash/shell.h" |
| 10 #include "ash/shell_window_ids.h" | 10 #include "ash/shell_window_ids.h" |
| (...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 125 | 125 |
| 126 // Passing false for is_alt_down does not start a cycle gesture. | 126 // Passing false for is_alt_down does not start a cycle gesture. |
| 127 controller->HandleCycleWindow(WindowCycleController::FORWARD, false); | 127 controller->HandleCycleWindow(WindowCycleController::FORWARD, false); |
| 128 EXPECT_FALSE(controller->IsCycling()); | 128 EXPECT_FALSE(controller->IsCycling()); |
| 129 EXPECT_TRUE(wm::IsActiveWindow(window1.get())); | 129 EXPECT_TRUE(wm::IsActiveWindow(window1.get())); |
| 130 | 130 |
| 131 controller->HandleCycleWindow(WindowCycleController::FORWARD, false); | 131 controller->HandleCycleWindow(WindowCycleController::FORWARD, false); |
| 132 EXPECT_FALSE(controller->IsCycling()); | 132 EXPECT_FALSE(controller->IsCycling()); |
| 133 EXPECT_TRUE(wm::IsActiveWindow(window0.get())); | 133 EXPECT_TRUE(wm::IsActiveWindow(window0.get())); |
| 134 | 134 |
| 135 // When a screen lock window is visible, cycling window does not take effect. | 135 // When the screen is locked, cycling window does not take effect. |
| 136 aura::Window* lock_screen_container = | 136 Shell::GetInstance()->delegate()->LockScreen(); |
| 137 Shell::GetInstance()->GetContainer( | |
| 138 internal::kShellWindowId_LockScreenContainer); | |
| 139 scoped_ptr<Window> lock_screen_window( | |
| 140 CreateTestWindowWithId(-1, lock_screen_container)); | |
| 141 lock_screen_window->Show(); | |
| 142 EXPECT_TRUE(wm::IsActiveWindow(window0.get())); | 137 EXPECT_TRUE(wm::IsActiveWindow(window0.get())); |
| 143 controller->HandleCycleWindow(WindowCycleController::FORWARD, false); | 138 controller->HandleCycleWindow(WindowCycleController::FORWARD, false); |
| 144 EXPECT_TRUE(wm::IsActiveWindow(window0.get())); | 139 EXPECT_TRUE(wm::IsActiveWindow(window0.get())); |
| 145 controller->HandleCycleWindow(WindowCycleController::BACKWARD, false); | 140 controller->HandleCycleWindow(WindowCycleController::BACKWARD, false); |
| 146 EXPECT_TRUE(wm::IsActiveWindow(window0.get())); | 141 EXPECT_TRUE(wm::IsActiveWindow(window0.get())); |
| 147 | 142 |
| 148 // Hiding the lock screen is equivalent to not being locked. | 143 Shell::GetInstance()->delegate()->UnlockScreen(); |
| 149 lock_screen_window->Hide(); | |
| 150 EXPECT_TRUE(wm::IsActiveWindow(window0.get())); | 144 EXPECT_TRUE(wm::IsActiveWindow(window0.get())); |
| 151 controller->HandleCycleWindow(WindowCycleController::FORWARD, false); | 145 controller->HandleCycleWindow(WindowCycleController::FORWARD, false); |
| 152 EXPECT_TRUE(wm::IsActiveWindow(window1.get())); | 146 EXPECT_TRUE(wm::IsActiveWindow(window1.get())); |
| 153 controller->HandleCycleWindow(WindowCycleController::FORWARD, false); | 147 controller->HandleCycleWindow(WindowCycleController::FORWARD, false); |
| 154 EXPECT_TRUE(wm::IsActiveWindow(window0.get())); | 148 EXPECT_TRUE(wm::IsActiveWindow(window0.get())); |
| 155 | 149 |
| 156 // When a modal window is active, cycling window does not take effect. | 150 // When a modal window is active, cycling window does not take effect. |
| 157 aura::Window* modal_container = | 151 aura::Window* modal_container = |
| 158 ash::Shell::GetInstance()->GetContainer( | 152 ash::Shell::GetInstance()->GetContainer( |
| 159 internal::kShellWindowId_SystemModalContainer); | 153 internal::kShellWindowId_SystemModalContainer); |
| 160 scoped_ptr<Window> modal_window( | 154 scoped_ptr<Window> modal_window( |
| 161 CreateTestWindowWithId(-2, modal_container)); | 155 CreateTestWindowWithId(-2, modal_container)); |
| 162 wm::ActivateWindow(modal_window.get()); | 156 wm::ActivateWindow(modal_window.get()); |
| 163 EXPECT_TRUE(wm::IsActiveWindow(modal_window.get())); | 157 EXPECT_TRUE(wm::IsActiveWindow(modal_window.get())); |
| 164 controller->HandleCycleWindow(WindowCycleController::FORWARD, false); | 158 controller->HandleCycleWindow(WindowCycleController::FORWARD, false); |
| 165 EXPECT_TRUE(wm::IsActiveWindow(modal_window.get())); | 159 EXPECT_TRUE(wm::IsActiveWindow(modal_window.get())); |
| 166 EXPECT_FALSE(wm::IsActiveWindow(window0.get())); | 160 EXPECT_FALSE(wm::IsActiveWindow(window0.get())); |
| 167 EXPECT_FALSE(wm::IsActiveWindow(window1.get())); | 161 EXPECT_FALSE(wm::IsActiveWindow(window1.get())); |
| 168 EXPECT_FALSE(wm::IsActiveWindow(window2.get())); | 162 EXPECT_FALSE(wm::IsActiveWindow(window2.get())); |
| 169 controller->HandleCycleWindow(WindowCycleController::BACKWARD, false); | 163 controller->HandleCycleWindow(WindowCycleController::BACKWARD, false); |
| 170 EXPECT_TRUE(wm::IsActiveWindow(modal_window.get())); | 164 EXPECT_TRUE(wm::IsActiveWindow(modal_window.get())); |
| 171 EXPECT_FALSE(wm::IsActiveWindow(window0.get())); | 165 EXPECT_FALSE(wm::IsActiveWindow(window0.get())); |
| 172 EXPECT_FALSE(wm::IsActiveWindow(window1.get())); | 166 EXPECT_FALSE(wm::IsActiveWindow(window1.get())); |
| 173 EXPECT_FALSE(wm::IsActiveWindow(window2.get())); | 167 EXPECT_FALSE(wm::IsActiveWindow(window2.get())); |
| 174 } | 168 } |
| 175 | 169 |
| 176 } // namespace | 170 } // namespace |
| 177 | 171 |
| 178 } // namespace ash | 172 } // namespace ash |
| OLD | NEW |