OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/wm_shell.h" | 5 #include "ash/common/wm_shell.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
| 9 #include "ash/common/accelerators/accelerator_controller.h" |
9 #include "ash/common/accessibility_delegate.h" | 10 #include "ash/common/accessibility_delegate.h" |
10 #include "ash/common/focus_cycler.h" | 11 #include "ash/common/focus_cycler.h" |
11 #include "ash/common/keyboard/keyboard_ui.h" | 12 #include "ash/common/keyboard/keyboard_ui.h" |
12 #include "ash/common/shelf/shelf_model.h" | 13 #include "ash/common/shelf/shelf_model.h" |
13 #include "ash/common/shell_delegate.h" | 14 #include "ash/common/shell_delegate.h" |
14 #include "ash/common/shell_window_ids.h" | 15 #include "ash/common/shell_window_ids.h" |
15 #include "ash/common/system/brightness_control_delegate.h" | 16 #include "ash/common/system/brightness_control_delegate.h" |
16 #include "ash/common/system/keyboard_brightness_control_delegate.h" | 17 #include "ash/common/system/keyboard_brightness_control_delegate.h" |
17 #include "ash/common/system/toast/toast_manager.h" | 18 #include "ash/common/system/toast/toast_manager.h" |
18 #include "ash/common/system/tray/system_tray_delegate.h" | 19 #include "ash/common/system/tray/system_tray_delegate.h" |
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
208 } | 209 } |
209 | 210 |
210 void WmShell::DeleteMruWindowTracker() { | 211 void WmShell::DeleteMruWindowTracker() { |
211 mru_window_tracker_.reset(); | 212 mru_window_tracker_.reset(); |
212 } | 213 } |
213 | 214 |
214 void WmShell::DeleteToastManager() { | 215 void WmShell::DeleteToastManager() { |
215 toast_manager_.reset(); | 216 toast_manager_.reset(); |
216 } | 217 } |
217 | 218 |
| 219 void WmShell::SetAcceleratorController( |
| 220 std::unique_ptr<AcceleratorController> accelerator_controller) { |
| 221 accelerator_controller_ = std::move(accelerator_controller); |
| 222 } |
| 223 |
218 } // namespace ash | 224 } // namespace ash |
OLD | NEW |