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/accelerators/accelerator_controller.h" | 5 #include "ash/accelerators/accelerator_controller.h" |
6 | 6 |
7 #include "ash/accelerators/accelerator_table.h" | 7 #include "ash/accelerators/accelerator_table.h" |
8 #include "ash/ash_switches.h" | |
9 #include "ash/aura/wm_window_aura.h" | 8 #include "ash/aura/wm_window_aura.h" |
10 #include "ash/common/accessibility_delegate.h" | 9 #include "ash/common/accessibility_delegate.h" |
| 10 #include "ash/common/ash_switches.h" |
11 #include "ash/common/shell_window_ids.h" | 11 #include "ash/common/shell_window_ids.h" |
12 #include "ash/common/system/tray/system_tray_delegate.h" | 12 #include "ash/common/system/tray/system_tray_delegate.h" |
13 #include "ash/common/system/volume_control_delegate.h" | 13 #include "ash/common/system/volume_control_delegate.h" |
14 #include "ash/common/wm/panels/panel_layout_manager.h" | 14 #include "ash/common/wm/panels/panel_layout_manager.h" |
15 #include "ash/common/wm/window_positioning_utils.h" | 15 #include "ash/common/wm/window_positioning_utils.h" |
16 #include "ash/common/wm/window_state.h" | 16 #include "ash/common/wm/window_state.h" |
17 #include "ash/common/wm/wm_event.h" | 17 #include "ash/common/wm/wm_event.h" |
18 #include "ash/common/wm_shell.h" | 18 #include "ash/common/wm_shell.h" |
19 #include "ash/display/display_manager.h" | 19 #include "ash/display/display_manager.h" |
20 #include "ash/ime_control_delegate.h" | 20 #include "ash/ime_control_delegate.h" |
(...skipping 1398 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1419 EXPECT_TRUE(IsMessageCenterEmpty()); | 1419 EXPECT_TRUE(IsMessageCenterEmpty()); |
1420 | 1420 |
1421 // If the action is LOCK_SCREEN, we must reset the state by unlocking the | 1421 // If the action is LOCK_SCREEN, we must reset the state by unlocking the |
1422 // screen before we proceed testing the rest of accelerators. | 1422 // screen before we proceed testing the rest of accelerators. |
1423 ResetStateIfNeeded(); | 1423 ResetStateIfNeeded(); |
1424 } | 1424 } |
1425 } | 1425 } |
1426 #endif // defined(OS_CHROMEOS) | 1426 #endif // defined(OS_CHROMEOS) |
1427 | 1427 |
1428 } // namespace ash | 1428 } // namespace ash |
OLD | NEW |