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" |
11 #include "ash/common/accessibility_delegate.h" | 11 #include "ash/common/accessibility_delegate.h" |
12 #include "ash/common/cast_config_controller.h" | 12 #include "ash/common/cast_config_controller.h" |
13 #include "ash/common/devtools/ash_devtools_css_agent.h" | 13 #include "ash/common/devtools/ash_devtools_css_agent.h" |
14 #include "ash/common/devtools/ash_devtools_dom_agent.h" | 14 #include "ash/common/devtools/ash_devtools_dom_agent.h" |
15 #include "ash/common/focus_cycler.h" | 15 #include "ash/common/focus_cycler.h" |
16 #include "ash/common/keyboard/keyboard_ui.h" | 16 #include "ash/common/keyboard/keyboard_ui.h" |
17 #include "ash/common/new_window_client_proxy.h" | 17 #include "ash/common/new_window_client_proxy.h" |
18 #include "ash/common/palette_delegate.h" | 18 #include "ash/common/palette_delegate.h" |
| 19 #include "ash/common/session/session_controller.h" |
19 #include "ash/common/session/session_state_delegate.h" | 20 #include "ash/common/session/session_state_delegate.h" |
20 #include "ash/common/shelf/app_list_shelf_item_delegate.h" | 21 #include "ash/common/shelf/app_list_shelf_item_delegate.h" |
21 #include "ash/common/shelf/shelf_controller.h" | 22 #include "ash/common/shelf/shelf_controller.h" |
22 #include "ash/common/shelf/shelf_delegate.h" | 23 #include "ash/common/shelf/shelf_delegate.h" |
23 #include "ash/common/shelf/shelf_model.h" | 24 #include "ash/common/shelf/shelf_model.h" |
24 #include "ash/common/shelf/shelf_window_watcher.h" | 25 #include "ash/common/shelf/shelf_window_watcher.h" |
25 #include "ash/common/shell_delegate.h" | 26 #include "ash/common/shell_delegate.h" |
26 #include "ash/common/shutdown_controller.h" | 27 #include "ash/common/shutdown_controller.h" |
27 #include "ash/common/system/brightness_control_delegate.h" | 28 #include "ash/common/system/brightness_control_delegate.h" |
28 #include "ash/common/system/keyboard_brightness_control_delegate.h" | 29 #include "ash/common/system/keyboard_brightness_control_delegate.h" |
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
248 | 249 |
249 WmShell::WmShell(std::unique_ptr<ShellDelegate> shell_delegate) | 250 WmShell::WmShell(std::unique_ptr<ShellDelegate> shell_delegate) |
250 : delegate_(std::move(shell_delegate)), | 251 : delegate_(std::move(shell_delegate)), |
251 cast_config_(base::MakeUnique<CastConfigController>()), | 252 cast_config_(base::MakeUnique<CastConfigController>()), |
252 focus_cycler_(base::MakeUnique<FocusCycler>()), | 253 focus_cycler_(base::MakeUnique<FocusCycler>()), |
253 immersive_context_(base::MakeUnique<ImmersiveContextAsh>()), | 254 immersive_context_(base::MakeUnique<ImmersiveContextAsh>()), |
254 locale_notification_controller_( | 255 locale_notification_controller_( |
255 base::MakeUnique<LocaleNotificationController>()), | 256 base::MakeUnique<LocaleNotificationController>()), |
256 new_window_client_(base::MakeUnique<NewWindowClientProxy>( | 257 new_window_client_(base::MakeUnique<NewWindowClientProxy>( |
257 delegate_->GetShellConnector())), | 258 delegate_->GetShellConnector())), |
| 259 session_controller_(base::MakeUnique<SessionController>()), |
258 shelf_controller_(base::MakeUnique<ShelfController>()), | 260 shelf_controller_(base::MakeUnique<ShelfController>()), |
259 shutdown_controller_(base::MakeUnique<ShutdownController>()), | 261 shutdown_controller_(base::MakeUnique<ShutdownController>()), |
260 system_tray_controller_(base::MakeUnique<SystemTrayController>()), | 262 system_tray_controller_(base::MakeUnique<SystemTrayController>()), |
261 system_tray_notifier_(base::MakeUnique<SystemTrayNotifier>()), | 263 system_tray_notifier_(base::MakeUnique<SystemTrayNotifier>()), |
262 wallpaper_delegate_(delegate_->CreateWallpaperDelegate()), | 264 wallpaper_delegate_(delegate_->CreateWallpaperDelegate()), |
263 window_cycle_controller_(base::MakeUnique<WindowCycleController>()), | 265 window_cycle_controller_(base::MakeUnique<WindowCycleController>()), |
264 window_selector_controller_( | 266 window_selector_controller_( |
265 base::MakeUnique<WindowSelectorController>()) { | 267 base::MakeUnique<WindowSelectorController>()) { |
266 #if defined(OS_CHROMEOS) | 268 #if defined(OS_CHROMEOS) |
267 brightness_control_delegate_.reset(new system::BrightnessControllerChromeos); | 269 brightness_control_delegate_.reset(new system::BrightnessControllerChromeos); |
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
405 void WmShell::DeleteToastManager() { | 407 void WmShell::DeleteToastManager() { |
406 toast_manager_.reset(); | 408 toast_manager_.reset(); |
407 } | 409 } |
408 | 410 |
409 void WmShell::SetAcceleratorController( | 411 void WmShell::SetAcceleratorController( |
410 std::unique_ptr<AcceleratorController> accelerator_controller) { | 412 std::unique_ptr<AcceleratorController> accelerator_controller) { |
411 accelerator_controller_ = std::move(accelerator_controller); | 413 accelerator_controller_ = std::move(accelerator_controller); |
412 } | 414 } |
413 | 415 |
414 } // namespace ash | 416 } // namespace ash |
OLD | NEW |