| 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 230 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 241 shelf_delegate_ = std::move(test_delegate); | 241 shelf_delegate_ = std::move(test_delegate); |
| 242 } | 242 } |
| 243 | 243 |
| 244 void WmShell::SetPaletteDelegateForTesting( | 244 void WmShell::SetPaletteDelegateForTesting( |
| 245 std::unique_ptr<PaletteDelegate> palette_delegate) { | 245 std::unique_ptr<PaletteDelegate> palette_delegate) { |
| 246 palette_delegate_ = std::move(palette_delegate); | 246 palette_delegate_ = std::move(palette_delegate); |
| 247 } | 247 } |
| 248 | 248 |
| 249 WmShell::WmShell(std::unique_ptr<ShellDelegate> shell_delegate) | 249 WmShell::WmShell(std::unique_ptr<ShellDelegate> shell_delegate) |
| 250 : delegate_(std::move(shell_delegate)), | 250 : delegate_(std::move(shell_delegate)), |
| 251 app_list_(base::MakeUnique<app_list::AppList>()), |
| 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_controller_(base::MakeUnique<NewWindowController>()), | 257 new_window_controller_(base::MakeUnique<NewWindowController>()), |
| 257 shelf_controller_(base::MakeUnique<ShelfController>()), | 258 shelf_controller_(base::MakeUnique<ShelfController>()), |
| 258 shutdown_controller_(base::MakeUnique<ShutdownController>()), | 259 shutdown_controller_(base::MakeUnique<ShutdownController>()), |
| 259 system_tray_controller_(base::MakeUnique<SystemTrayController>()), | 260 system_tray_controller_(base::MakeUnique<SystemTrayController>()), |
| 260 system_tray_notifier_(base::MakeUnique<SystemTrayNotifier>()), | 261 system_tray_notifier_(base::MakeUnique<SystemTrayNotifier>()), |
| (...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 404 void WmShell::DeleteToastManager() { | 405 void WmShell::DeleteToastManager() { |
| 405 toast_manager_.reset(); | 406 toast_manager_.reset(); |
| 406 } | 407 } |
| 407 | 408 |
| 408 void WmShell::SetAcceleratorController( | 409 void WmShell::SetAcceleratorController( |
| 409 std::unique_ptr<AcceleratorController> accelerator_controller) { | 410 std::unique_ptr<AcceleratorController> accelerator_controller) { |
| 410 accelerator_controller_ = std::move(accelerator_controller); | 411 accelerator_controller_ = std::move(accelerator_controller); |
| 411 } | 412 } |
| 412 | 413 |
| 413 } // namespace ash | 414 } // namespace ash |
| OLD | NEW |