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 <algorithm> | 7 #include <algorithm> |
8 #include <cmath> | 8 #include <cmath> |
9 #include <string> | 9 #include <string> |
10 #include <utility> | 10 #include <utility> |
11 | 11 |
12 #include "ash/accelerators/accelerator_commands.h" | 12 #include "ash/accelerators/accelerator_commands.h" |
13 #include "ash/accelerators/debug_commands.h" | 13 #include "ash/accelerators/debug_commands.h" |
14 #include "ash/common/accessibility_delegate.h" | 14 #include "ash/common/accessibility_delegate.h" |
15 #include "ash/common/accessibility_types.h" | 15 #include "ash/common/accessibility_types.h" |
16 #include "ash/common/ash_switches.h" | 16 #include "ash/common/ash_switches.h" |
17 #include "ash/common/focus_cycler.h" | 17 #include "ash/common/focus_cycler.h" |
18 #include "ash/common/media_delegate.h" | 18 #include "ash/common/media_delegate.h" |
| 19 #include "ash/common/multi_profile_uma.h" |
19 #include "ash/common/session/session_state_delegate.h" | 20 #include "ash/common/session/session_state_delegate.h" |
20 #include "ash/common/shelf/shelf_model.h" | 21 #include "ash/common/shelf/shelf_model.h" |
21 #include "ash/common/shell_delegate.h" | 22 #include "ash/common/shell_delegate.h" |
22 #include "ash/common/shell_window_ids.h" | 23 #include "ash/common/shell_window_ids.h" |
23 #include "ash/common/system/system_notifier.h" | 24 #include "ash/common/system/system_notifier.h" |
24 #include "ash/common/system/tray/system_tray_delegate.h" | 25 #include "ash/common/system/tray/system_tray_delegate.h" |
25 #include "ash/common/system/tray/system_tray_notifier.h" | 26 #include "ash/common/system/tray/system_tray_notifier.h" |
26 #include "ash/common/system/volume_control_delegate.h" | 27 #include "ash/common/system/volume_control_delegate.h" |
27 #include "ash/common/system/web_notification/web_notification_tray.h" | 28 #include "ash/common/system/web_notification/web_notification_tray.h" |
28 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h" | 29 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h" |
29 #include "ash/common/wm/mru_window_tracker.h" | 30 #include "ash/common/wm/mru_window_tracker.h" |
30 #include "ash/common/wm/overview/window_selector_controller.h" | 31 #include "ash/common/wm/overview/window_selector_controller.h" |
31 #include "ash/common/wm/window_state.h" | 32 #include "ash/common/wm/window_state.h" |
32 #include "ash/common/wm/wm_event.h" | 33 #include "ash/common/wm/wm_event.h" |
33 #include "ash/common/wm_shell.h" | 34 #include "ash/common/wm_shell.h" |
34 #include "ash/debug.h" | 35 #include "ash/debug.h" |
35 #include "ash/display/window_tree_host_manager.h" | 36 #include "ash/display/window_tree_host_manager.h" |
36 #include "ash/gpu_support.h" | 37 #include "ash/gpu_support.h" |
37 #include "ash/ime_control_delegate.h" | 38 #include "ash/ime_control_delegate.h" |
38 #include "ash/magnifier/magnification_controller.h" | 39 #include "ash/magnifier/magnification_controller.h" |
39 #include "ash/magnifier/partial_magnification_controller.h" | 40 #include "ash/magnifier/partial_magnification_controller.h" |
40 #include "ash/multi_profile_uma.h" | |
41 #include "ash/new_window_delegate.h" | 41 #include "ash/new_window_delegate.h" |
42 #include "ash/root_window_controller.h" | 42 #include "ash/root_window_controller.h" |
43 #include "ash/rotator/screen_rotation_animator.h" | 43 #include "ash/rotator/screen_rotation_animator.h" |
44 #include "ash/rotator/window_rotation.h" | 44 #include "ash/rotator/window_rotation.h" |
45 #include "ash/screen_util.h" | 45 #include "ash/screen_util.h" |
46 #include "ash/screenshot_delegate.h" | 46 #include "ash/screenshot_delegate.h" |
47 #include "ash/shelf/shelf.h" | 47 #include "ash/shelf/shelf.h" |
48 #include "ash/shelf/shelf_delegate.h" | 48 #include "ash/shelf/shelf_delegate.h" |
49 #include "ash/shelf/shelf_widget.h" | 49 #include "ash/shelf/shelf_widget.h" |
50 #include "ash/shell.h" | 50 #include "ash/shell.h" |
(...skipping 1387 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1438 } | 1438 } |
1439 | 1439 |
1440 void AcceleratorController::SetKeyboardBrightnessControlDelegate( | 1440 void AcceleratorController::SetKeyboardBrightnessControlDelegate( |
1441 std::unique_ptr<KeyboardBrightnessControlDelegate> | 1441 std::unique_ptr<KeyboardBrightnessControlDelegate> |
1442 keyboard_brightness_control_delegate) { | 1442 keyboard_brightness_control_delegate) { |
1443 keyboard_brightness_control_delegate_ = | 1443 keyboard_brightness_control_delegate_ = |
1444 std::move(keyboard_brightness_control_delegate); | 1444 std::move(keyboard_brightness_control_delegate); |
1445 } | 1445 } |
1446 | 1446 |
1447 } // namespace ash | 1447 } // namespace ash |
OLD | NEW |