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/accessibility_delegate.h" | 8 #include "ash/accessibility_delegate.h" |
9 #include "ash/accessibility_types.h" | 9 #include "ash/accessibility_types.h" |
10 #include "ash/ash_switches.h" | 10 #include "ash/ash_switches.h" |
(...skipping 13 matching lines...) Expand all Loading... |
24 #include "ash/test/test_shelf_delegate.h" | 24 #include "ash/test/test_shelf_delegate.h" |
25 #include "ash/wm/lock_state_controller.h" | 25 #include "ash/wm/lock_state_controller.h" |
26 #include "ash/wm/panels/panel_layout_manager.h" | 26 #include "ash/wm/panels/panel_layout_manager.h" |
27 #include "ash/wm/window_positioning_utils.h" | 27 #include "ash/wm/window_positioning_utils.h" |
28 #include "ash/wm/window_state.h" | 28 #include "ash/wm/window_state.h" |
29 #include "ash/wm/window_state_aura.h" | 29 #include "ash/wm/window_state_aura.h" |
30 #include "ash/wm/window_util.h" | 30 #include "ash/wm/window_util.h" |
31 #include "ash/wm/wm_event.h" | 31 #include "ash/wm/wm_event.h" |
32 #include "ash/wm_window.h" | 32 #include "ash/wm_window.h" |
33 #include "base/command_line.h" | 33 #include "base/command_line.h" |
34 #include "base/test/user_action_tester.cc" | 34 #include "base/test/user_action_tester.h" |
35 #include "services/ui/public/interfaces/window_manager_constants.mojom.h" | 35 #include "services/ui/public/interfaces/window_manager_constants.mojom.h" |
36 #include "ui/app_list/presenter/app_list.h" | 36 #include "ui/app_list/presenter/app_list.h" |
37 #include "ui/app_list/presenter/test/test_app_list_presenter.h" | 37 #include "ui/app_list/presenter/test/test_app_list_presenter.h" |
38 #include "ui/aura/client/aura_constants.h" | 38 #include "ui/aura/client/aura_constants.h" |
39 #include "ui/aura/test/test_window_delegate.h" | 39 #include "ui/aura/test/test_window_delegate.h" |
40 #include "ui/aura/test/test_windows.h" | 40 #include "ui/aura/test/test_windows.h" |
41 #include "ui/aura/window.h" | 41 #include "ui/aura/window.h" |
42 #include "ui/base/ime/chromeos/fake_ime_keyboard.h" | 42 #include "ui/base/ime/chromeos/fake_ime_keyboard.h" |
43 #include "ui/base/ime/chromeos/ime_keyboard.h" | 43 #include "ui/base/ime/chromeos/ime_keyboard.h" |
44 #include "ui/base/ime/chromeos/input_method_manager.h" | 44 #include "ui/base/ime/chromeos/input_method_manager.h" |
(...skipping 1326 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1371 // Expect no notifications from the new accelerators. | 1371 // Expect no notifications from the new accelerators. |
1372 EXPECT_TRUE(IsMessageCenterEmpty()); | 1372 EXPECT_TRUE(IsMessageCenterEmpty()); |
1373 | 1373 |
1374 // If the action is LOCK_SCREEN, we must reset the state by unlocking the | 1374 // If the action is LOCK_SCREEN, we must reset the state by unlocking the |
1375 // screen before we proceed testing the rest of accelerators. | 1375 // screen before we proceed testing the rest of accelerators. |
1376 ResetStateIfNeeded(); | 1376 ResetStateIfNeeded(); |
1377 } | 1377 } |
1378 } | 1378 } |
1379 | 1379 |
1380 } // namespace ash | 1380 } // namespace ash |
OLD | NEW |