Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(457)

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: ash/accelerators/accelerator_controller_unittest.cc

Issue 2736573002: chromeos: Move files in //ash/common to //ash, part 2 (Closed)
Patch Set: Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ash/accelerators/accelerator_controller_delegate_aura.cc ('k') | ash/accelerators/accelerator_delegate.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/common/accelerators/accelerator_controller.h" 5 #include "ash/accelerators/accelerator_controller.h"
6 6
7 #include "ash/common/accelerators/accelerator_table.h" 7 #include "ash/accelerators/accelerator_table.h"
8 #include "ash/common/accessibility_delegate.h" 8 #include "ash/accessibility_delegate.h"
9 #include "ash/common/accessibility_types.h" 9 #include "ash/accessibility_types.h"
10 #include "ash/common/ash_switches.h" 10 #include "ash/ash_switches.h"
11 #include "ash/common/ime_control_delegate.h" 11 #include "ash/ime_control_delegate.h"
12 #include "ash/common/session/session_state_delegate.h"
13 #include "ash/common/test/test_shelf_delegate.h"
14 #include "ash/common/wm/panels/panel_layout_manager.h"
15 #include "ash/common/wm/window_positioning_utils.h"
16 #include "ash/common/wm/window_state.h"
17 #include "ash/common/wm/wm_event.h"
18 #include "ash/common/wm_shell.h"
19 #include "ash/common/wm_window.h"
20 #include "ash/public/cpp/shell_window_ids.h" 12 #include "ash/public/cpp/shell_window_ids.h"
13 #include "ash/session/session_state_delegate.h"
21 #include "ash/shell.h" 14 #include "ash/shell.h"
22 #include "ash/system/brightness_control_delegate.h" 15 #include "ash/system/brightness_control_delegate.h"
23 #include "ash/system/keyboard_brightness_control_delegate.h" 16 #include "ash/system/keyboard_brightness_control_delegate.h"
24 #include "ash/system/tray/system_tray_delegate.h" 17 #include "ash/system/tray/system_tray_delegate.h"
25 #include "ash/test/ash_test_base.h" 18 #include "ash/test/ash_test_base.h"
26 #include "ash/test/lock_state_controller_test_api.h" 19 #include "ash/test/lock_state_controller_test_api.h"
27 #include "ash/test/test_screenshot_delegate.h" 20 #include "ash/test/test_screenshot_delegate.h"
28 #include "ash/test/test_session_state_animator.h" 21 #include "ash/test/test_session_state_animator.h"
22 #include "ash/test/test_shelf_delegate.h"
29 #include "ash/wm/lock_state_controller.h" 23 #include "ash/wm/lock_state_controller.h"
24 #include "ash/wm/panels/panel_layout_manager.h"
25 #include "ash/wm/window_positioning_utils.h"
26 #include "ash/wm/window_state.h"
30 #include "ash/wm/window_state_aura.h" 27 #include "ash/wm/window_state_aura.h"
31 #include "ash/wm/window_util.h" 28 #include "ash/wm/window_util.h"
29 #include "ash/wm/wm_event.h"
30 #include "ash/wm_shell.h"
31 #include "ash/wm_window.h"
32 #include "base/command_line.h" 32 #include "base/command_line.h"
33 #include "base/test/user_action_tester.cc" 33 #include "base/test/user_action_tester.cc"
34 #include "services/ui/public/interfaces/window_manager_constants.mojom.h" 34 #include "services/ui/public/interfaces/window_manager_constants.mojom.h"
35 #include "ui/app_list/presenter/app_list.h" 35 #include "ui/app_list/presenter/app_list.h"
36 #include "ui/app_list/presenter/test/test_app_list_presenter.h" 36 #include "ui/app_list/presenter/test/test_app_list_presenter.h"
37 #include "ui/aura/client/aura_constants.h" 37 #include "ui/aura/client/aura_constants.h"
38 #include "ui/aura/test/test_window_delegate.h" 38 #include "ui/aura/test/test_window_delegate.h"
39 #include "ui/aura/test/test_windows.h" 39 #include "ui/aura/test/test_windows.h"
40 #include "ui/aura/window.h" 40 #include "ui/aura/window.h"
41 #include "ui/base/ime/chromeos/fake_ime_keyboard.h" 41 #include "ui/base/ime/chromeos/fake_ime_keyboard.h"
(...skipping 1524 matching lines...) Expand 10 before | Expand all | Expand 10 after
1566 // Expect no notifications from the new accelerators. 1566 // Expect no notifications from the new accelerators.
1567 EXPECT_TRUE(IsMessageCenterEmpty()); 1567 EXPECT_TRUE(IsMessageCenterEmpty());
1568 1568
1569 // If the action is LOCK_SCREEN, we must reset the state by unlocking the 1569 // If the action is LOCK_SCREEN, we must reset the state by unlocking the
1570 // screen before we proceed testing the rest of accelerators. 1570 // screen before we proceed testing the rest of accelerators.
1571 ResetStateIfNeeded(); 1571 ResetStateIfNeeded();
1572 } 1572 }
1573 } 1573 }
1574 1574
1575 } // namespace ash 1575 } // namespace ash
OLDNEW
« no previous file with comments | « ash/accelerators/accelerator_controller_delegate_aura.cc ('k') | ash/accelerators/accelerator_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698