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/devtools/ash_devtools_css_agent.h" | 12 #include "ash/common/devtools/ash_devtools_css_agent.h" |
13 #include "ash/common/devtools/ash_devtools_dom_agent.h" | 13 #include "ash/common/devtools/ash_devtools_dom_agent.h" |
14 #include "ash/common/focus_cycler.h" | 14 #include "ash/common/focus_cycler.h" |
15 #include "ash/common/keyboard/keyboard_ui.h" | 15 #include "ash/common/keyboard/keyboard_ui.h" |
16 #include "ash/common/new_window_client_proxy.h" | 16 #include "ash/common/new_window_client_proxy.h" |
17 #include "ash/common/palette_delegate.h" | 17 #include "ash/common/palette_delegate.h" |
| 18 #include "ash/common/session/session_controller.h" |
18 #include "ash/common/session/session_state_delegate.h" | 19 #include "ash/common/session/session_state_delegate.h" |
19 #include "ash/common/shelf/app_list_shelf_item_delegate.h" | 20 #include "ash/common/shelf/app_list_shelf_item_delegate.h" |
20 #include "ash/common/shelf/shelf_controller.h" | 21 #include "ash/common/shelf/shelf_controller.h" |
21 #include "ash/common/shelf/shelf_delegate.h" | 22 #include "ash/common/shelf/shelf_delegate.h" |
22 #include "ash/common/shelf/shelf_model.h" | 23 #include "ash/common/shelf/shelf_model.h" |
23 #include "ash/common/shelf/shelf_window_watcher.h" | 24 #include "ash/common/shelf/shelf_window_watcher.h" |
24 #include "ash/common/shell_delegate.h" | 25 #include "ash/common/shell_delegate.h" |
25 #include "ash/common/shutdown_controller.h" | 26 #include "ash/common/shutdown_controller.h" |
26 #include "ash/common/system/brightness_control_delegate.h" | 27 #include "ash/common/system/brightness_control_delegate.h" |
27 #include "ash/common/system/keyboard_brightness_control_delegate.h" | 28 #include "ash/common/system/keyboard_brightness_control_delegate.h" |
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
252 locale_notification_controller_( | 253 locale_notification_controller_( |
253 base::MakeUnique<LocaleNotificationController>()), | 254 base::MakeUnique<LocaleNotificationController>()), |
254 new_window_client_(base::MakeUnique<NewWindowClientProxy>( | 255 new_window_client_(base::MakeUnique<NewWindowClientProxy>( |
255 delegate_->GetShellConnector())), | 256 delegate_->GetShellConnector())), |
256 shelf_controller_(base::MakeUnique<ShelfController>()), | 257 shelf_controller_(base::MakeUnique<ShelfController>()), |
257 shutdown_controller_(base::MakeUnique<ShutdownController>()), | 258 shutdown_controller_(base::MakeUnique<ShutdownController>()), |
258 system_tray_controller_(base::MakeUnique<SystemTrayController>()), | 259 system_tray_controller_(base::MakeUnique<SystemTrayController>()), |
259 system_tray_notifier_(base::MakeUnique<SystemTrayNotifier>()), | 260 system_tray_notifier_(base::MakeUnique<SystemTrayNotifier>()), |
260 wallpaper_delegate_(delegate_->CreateWallpaperDelegate()), | 261 wallpaper_delegate_(delegate_->CreateWallpaperDelegate()), |
261 window_cycle_controller_(base::MakeUnique<WindowCycleController>()), | 262 window_cycle_controller_(base::MakeUnique<WindowCycleController>()), |
262 window_selector_controller_( | 263 window_selector_controller_(base::MakeUnique<WindowSelectorController>()), |
263 base::MakeUnique<WindowSelectorController>()) { | 264 session_controller_(base::MakeUnique<SessionController>()) { |
264 #if defined(OS_CHROMEOS) | 265 #if defined(OS_CHROMEOS) |
265 brightness_control_delegate_.reset(new system::BrightnessControllerChromeos); | 266 brightness_control_delegate_.reset(new system::BrightnessControllerChromeos); |
266 keyboard_brightness_control_delegate_.reset(new KeyboardBrightnessController); | 267 keyboard_brightness_control_delegate_.reset(new KeyboardBrightnessController); |
267 vpn_list_ = base::MakeUnique<VpnList>(); | 268 vpn_list_ = base::MakeUnique<VpnList>(); |
268 #endif | 269 #endif |
269 } | 270 } |
270 | 271 |
271 WmShell::~WmShell() {} | 272 WmShell::~WmShell() {} |
272 | 273 |
273 WmRootWindowController* WmShell::GetPrimaryRootWindowController() { | 274 WmRootWindowController* WmShell::GetPrimaryRootWindowController() { |
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
403 void WmShell::DeleteToastManager() { | 404 void WmShell::DeleteToastManager() { |
404 toast_manager_.reset(); | 405 toast_manager_.reset(); |
405 } | 406 } |
406 | 407 |
407 void WmShell::SetAcceleratorController( | 408 void WmShell::SetAcceleratorController( |
408 std::unique_ptr<AcceleratorController> accelerator_controller) { | 409 std::unique_ptr<AcceleratorController> accelerator_controller) { |
409 accelerator_controller_ = std::move(accelerator_controller); | 410 accelerator_controller_ = std::move(accelerator_controller); |
410 } | 411 } |
411 | 412 |
412 } // namespace ash | 413 } // namespace ash |
OLD | NEW |