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/test/ash_test_base.h" | 5 #include "ash/test/ash_test_base.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "ash/ash_switches.h" | 10 #include "ash/ash_switches.h" |
11 #include "ash/display/display_controller.h" | 11 #include "ash/display/display_controller.h" |
12 #include "ash/screen_ash.h" | |
13 #include "ash/shell.h" | 12 #include "ash/shell.h" |
14 #include "ash/shell/toplevel_window.h" | 13 #include "ash/shell/toplevel_window.h" |
15 #include "ash/test/ash_test_helper.h" | 14 #include "ash/test/ash_test_helper.h" |
16 #include "ash/test/display_manager_test_api.h" | 15 #include "ash/test/display_manager_test_api.h" |
17 #include "ash/test/test_session_state_delegate.h" | 16 #include "ash/test/test_session_state_delegate.h" |
18 #include "ash/test/test_shell_delegate.h" | 17 #include "ash/test/test_shell_delegate.h" |
19 #include "ash/test/test_system_tray_delegate.h" | 18 #include "ash/test/test_system_tray_delegate.h" |
20 #include "ash/wm/coordinate_conversion.h" | 19 #include "ash/wm/coordinate_conversion.h" |
21 #include "ash/wm/window_positioner.h" | 20 #include "ash/wm/window_positioner.h" |
22 #include "base/command_line.h" | 21 #include "base/command_line.h" |
(...skipping 314 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
337 | 336 |
338 void AshTestBase::UnblockUserSession() { | 337 void AshTestBase::UnblockUserSession() { |
339 Shell::GetInstance()->session_state_delegate()->UnlockScreen(); | 338 Shell::GetInstance()->session_state_delegate()->UnlockScreen(); |
340 SetSessionStarted(true); | 339 SetSessionStarted(true); |
341 SetUserAddingScreenRunning(false); | 340 SetUserAddingScreenRunning(false); |
342 } | 341 } |
343 | 342 |
344 | 343 |
345 } // namespace test | 344 } // namespace test |
346 } // namespace ash | 345 } // namespace ash |
OLD | NEW |