| 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 237 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 248 WmShell::WmShell(std::unique_ptr<ShellDelegate> shell_delegate) | 248 WmShell::WmShell(std::unique_ptr<ShellDelegate> shell_delegate) |
| 249 : delegate_(std::move(shell_delegate)), | 249 : delegate_(std::move(shell_delegate)), |
| 250 focus_cycler_(base::MakeUnique<FocusCycler>()), | 250 focus_cycler_(base::MakeUnique<FocusCycler>()), |
| 251 immersive_context_(base::MakeUnique<ImmersiveContextAsh>()), | 251 immersive_context_(base::MakeUnique<ImmersiveContextAsh>()), |
| 252 locale_notification_controller_( | 252 locale_notification_controller_( |
| 253 base::MakeUnique<LocaleNotificationController>()), | 253 base::MakeUnique<LocaleNotificationController>()), |
| 254 new_window_client_(base::MakeUnique<NewWindowClientProxy>( | 254 new_window_client_(base::MakeUnique<NewWindowClientProxy>( |
| 255 delegate_->GetShellConnector())), | 255 delegate_->GetShellConnector())), |
| 256 shelf_controller_(base::MakeUnique<ShelfController>()), | 256 shelf_controller_(base::MakeUnique<ShelfController>()), |
| 257 shutdown_controller_(base::MakeUnique<ShutdownController>()), | 257 shutdown_controller_(base::MakeUnique<ShutdownController>()), |
| 258 system_tray_controller_(base::MakeUnique<SystemTrayController>( | 258 system_tray_controller_(base::MakeUnique<SystemTrayController>()), |
| 259 delegate_->GetShellConnector())), | |
| 260 system_tray_notifier_(base::MakeUnique<SystemTrayNotifier>()), | 259 system_tray_notifier_(base::MakeUnique<SystemTrayNotifier>()), |
| 261 wallpaper_delegate_(delegate_->CreateWallpaperDelegate()), | 260 wallpaper_delegate_(delegate_->CreateWallpaperDelegate()), |
| 262 window_cycle_controller_(base::MakeUnique<WindowCycleController>()), | 261 window_cycle_controller_(base::MakeUnique<WindowCycleController>()), |
| 263 window_selector_controller_( | 262 window_selector_controller_( |
| 264 base::MakeUnique<WindowSelectorController>()) { | 263 base::MakeUnique<WindowSelectorController>()) { |
| 265 #if defined(OS_CHROMEOS) | 264 #if defined(OS_CHROMEOS) |
| 266 brightness_control_delegate_.reset(new system::BrightnessControllerChromeos); | 265 brightness_control_delegate_.reset(new system::BrightnessControllerChromeos); |
| 267 keyboard_brightness_control_delegate_.reset(new KeyboardBrightnessController); | 266 keyboard_brightness_control_delegate_.reset(new KeyboardBrightnessController); |
| 268 vpn_list_ = base::MakeUnique<VpnList>(); | 267 vpn_list_ = base::MakeUnique<VpnList>(); |
| 269 #endif | 268 #endif |
| (...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 404 void WmShell::DeleteToastManager() { | 403 void WmShell::DeleteToastManager() { |
| 405 toast_manager_.reset(); | 404 toast_manager_.reset(); |
| 406 } | 405 } |
| 407 | 406 |
| 408 void WmShell::SetAcceleratorController( | 407 void WmShell::SetAcceleratorController( |
| 409 std::unique_ptr<AcceleratorController> accelerator_controller) { | 408 std::unique_ptr<AcceleratorController> accelerator_controller) { |
| 410 accelerator_controller_ = std::move(accelerator_controller); | 409 accelerator_controller_ = std::move(accelerator_controller); |
| 411 } | 410 } |
| 412 | 411 |
| 413 } // namespace ash | 412 } // namespace ash |
| OLD | NEW |