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" |
(...skipping 11 matching lines...) Expand all Loading... |
22 #include "ui/aura/client/screen_position_client.h" | 22 #include "ui/aura/client/screen_position_client.h" |
23 #include "ui/aura/client/window_tree_client.h" | 23 #include "ui/aura/client/window_tree_client.h" |
24 #include "ui/aura/test/event_generator_delegate_aura.h" | 24 #include "ui/aura/test/event_generator_delegate_aura.h" |
25 #include "ui/aura/test/test_window_delegate.h" | 25 #include "ui/aura/test/test_window_delegate.h" |
26 #include "ui/aura/window.h" | 26 #include "ui/aura/window.h" |
27 #include "ui/aura/window_delegate.h" | 27 #include "ui/aura/window_delegate.h" |
28 #include "ui/aura/window_tree_host.h" | 28 #include "ui/aura/window_tree_host.h" |
29 #include "ui/base/ime/input_method_initializer.h" | 29 #include "ui/base/ime/input_method_initializer.h" |
30 #include "ui/events/gesture_detection/gesture_configuration.h" | 30 #include "ui/events/gesture_detection/gesture_configuration.h" |
31 #include "ui/gfx/display.h" | 31 #include "ui/gfx/display.h" |
32 #include "ui/gfx/point.h" | 32 #include "ui/gfx/geometry/point.h" |
33 #include "ui/gfx/screen.h" | 33 #include "ui/gfx/screen.h" |
34 #include "ui/wm/core/coordinate_conversion.h" | 34 #include "ui/wm/core/coordinate_conversion.h" |
35 | 35 |
36 #if defined(OS_CHROMEOS) | 36 #if defined(OS_CHROMEOS) |
37 #include "ash/system/chromeos/tray_display.h" | 37 #include "ash/system/chromeos/tray_display.h" |
38 #endif | 38 #endif |
39 | 39 |
40 #if defined(OS_WIN) | 40 #if defined(OS_WIN) |
41 #include "ash/test/test_metro_viewer_process_host.h" | 41 #include "ash/test/test_metro_viewer_process_host.h" |
42 #include "base/win/metro.h" | 42 #include "base/win/metro.h" |
(...skipping 293 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
336 | 336 |
337 void AshTestBase::UnblockUserSession() { | 337 void AshTestBase::UnblockUserSession() { |
338 Shell::GetInstance()->session_state_delegate()->UnlockScreen(); | 338 Shell::GetInstance()->session_state_delegate()->UnlockScreen(); |
339 SetSessionStarted(true); | 339 SetSessionStarted(true); |
340 SetUserAddingScreenRunning(false); | 340 SetUserAddingScreenRunning(false); |
341 } | 341 } |
342 | 342 |
343 | 343 |
344 } // namespace test | 344 } // namespace test |
345 } // namespace ash | 345 } // namespace ash |
OLD | NEW |