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/accelerators/accelerator_controller.h" |
10 #include "ash/common/accelerators/ash_focus_manager_factory.h" | 10 #include "ash/common/accelerators/ash_focus_manager_factory.h" |
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
148 | 148 |
149 void WmShell::RemoveLockStateObserver(LockStateObserver* observer) { | 149 void WmShell::RemoveLockStateObserver(LockStateObserver* observer) { |
150 lock_state_observers_.RemoveObserver(observer); | 150 lock_state_observers_.RemoveObserver(observer); |
151 } | 151 } |
152 | 152 |
153 void WmShell::SetShelfDelegateForTesting( | 153 void WmShell::SetShelfDelegateForTesting( |
154 std::unique_ptr<ShelfDelegate> test_delegate) { | 154 std::unique_ptr<ShelfDelegate> test_delegate) { |
155 shelf_delegate_ = std::move(test_delegate); | 155 shelf_delegate_ = std::move(test_delegate); |
156 } | 156 } |
157 | 157 |
| 158 void WmShell::SetPaletteDelegateForTesting( |
| 159 std::unique_ptr<PaletteDelegate> palette_delegate) { |
| 160 palette_delegate_ = std::move(palette_delegate); |
| 161 } |
| 162 |
158 WmShell::WmShell(std::unique_ptr<ShellDelegate> shell_delegate) | 163 WmShell::WmShell(std::unique_ptr<ShellDelegate> shell_delegate) |
159 : delegate_(std::move(shell_delegate)), | 164 : delegate_(std::move(shell_delegate)), |
160 focus_cycler_(new FocusCycler), | 165 focus_cycler_(new FocusCycler), |
161 shelf_model_(new ShelfModel), // Must create before ShelfDelegate. | 166 shelf_model_(new ShelfModel), // Must create before ShelfDelegate. |
162 system_tray_notifier_(new SystemTrayNotifier), | 167 system_tray_notifier_(new SystemTrayNotifier), |
163 window_cycle_controller_(new WindowCycleController), | 168 window_cycle_controller_(new WindowCycleController), |
164 window_selector_controller_(new WindowSelectorController) { | 169 window_selector_controller_(new WindowSelectorController) { |
165 #if defined(OS_CHROMEOS) | 170 #if defined(OS_CHROMEOS) |
166 brightness_control_delegate_.reset(new system::BrightnessControllerChromeos); | 171 brightness_control_delegate_.reset(new system::BrightnessControllerChromeos); |
167 keyboard_brightness_control_delegate_.reset(new KeyboardBrightnessController); | 172 keyboard_brightness_control_delegate_.reset(new KeyboardBrightnessController); |
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
288 void WmShell::DeleteToastManager() { | 293 void WmShell::DeleteToastManager() { |
289 toast_manager_.reset(); | 294 toast_manager_.reset(); |
290 } | 295 } |
291 | 296 |
292 void WmShell::SetAcceleratorController( | 297 void WmShell::SetAcceleratorController( |
293 std::unique_ptr<AcceleratorController> accelerator_controller) { | 298 std::unique_ptr<AcceleratorController> accelerator_controller) { |
294 accelerator_controller_ = std::move(accelerator_controller); | 299 accelerator_controller_ = std::move(accelerator_controller); |
295 } | 300 } |
296 | 301 |
297 } // namespace ash | 302 } // namespace ash |
OLD | NEW |