| 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 28 matching lines...) Expand all Loading... |
| 39 #include "ash/common/wm/overview/window_selector_controller.h" | 39 #include "ash/common/wm/overview/window_selector_controller.h" |
| 40 #include "ash/common/wm/root_window_finder.h" | 40 #include "ash/common/wm/root_window_finder.h" |
| 41 #include "ash/common/wm/system_modal_container_layout_manager.h" | 41 #include "ash/common/wm/system_modal_container_layout_manager.h" |
| 42 #include "ash/common/wm/window_cycle_controller.h" | 42 #include "ash/common/wm/window_cycle_controller.h" |
| 43 #include "ash/common/wm_root_window_controller.h" | 43 #include "ash/common/wm_root_window_controller.h" |
| 44 #include "ash/common/wm_window.h" | 44 #include "ash/common/wm_window.h" |
| 45 #include "ash/public/cpp/shell_window_ids.h" | 45 #include "ash/public/cpp/shell_window_ids.h" |
| 46 #include "base/bind.h" | 46 #include "base/bind.h" |
| 47 #include "base/logging.h" | 47 #include "base/logging.h" |
| 48 #include "base/memory/ptr_util.h" | 48 #include "base/memory/ptr_util.h" |
| 49 #include "ui/app_list/presenter/app_list.h" |
| 49 #include "ui/app_list/presenter/app_list_presenter.h" | 50 #include "ui/app_list/presenter/app_list_presenter.h" |
| 50 #include "ui/display/display.h" | 51 #include "ui/display/display.h" |
| 51 #include "ui/views/focus/focus_manager_factory.h" | 52 #include "ui/views/focus/focus_manager_factory.h" |
| 52 | 53 |
| 53 #if defined(OS_CHROMEOS) | 54 #if defined(OS_CHROMEOS) |
| 54 #include "ash/common/system/chromeos/brightness/brightness_controller_chromeos.h
" | 55 #include "ash/common/system/chromeos/brightness/brightness_controller_chromeos.h
" |
| 55 #include "ash/common/system/chromeos/keyboard_brightness_controller.h" | 56 #include "ash/common/system/chromeos/keyboard_brightness_controller.h" |
| 56 #include "ash/common/system/chromeos/network/vpn_list.h" | 57 #include "ash/common/system/chromeos/network/vpn_list.h" |
| 57 #include "ash/common/system/chromeos/session/logout_confirmation_controller.h" | 58 #include "ash/common/system/chromeos/session/logout_confirmation_controller.h" |
| 58 #endif | 59 #endif |
| (...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 241 shelf_delegate_ = std::move(test_delegate); | 242 shelf_delegate_ = std::move(test_delegate); |
| 242 } | 243 } |
| 243 | 244 |
| 244 void WmShell::SetPaletteDelegateForTesting( | 245 void WmShell::SetPaletteDelegateForTesting( |
| 245 std::unique_ptr<PaletteDelegate> palette_delegate) { | 246 std::unique_ptr<PaletteDelegate> palette_delegate) { |
| 246 palette_delegate_ = std::move(palette_delegate); | 247 palette_delegate_ = std::move(palette_delegate); |
| 247 } | 248 } |
| 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)), |
| 252 app_list_(base::MakeUnique<app_list::AppList>()), |
| 251 cast_config_(base::MakeUnique<CastConfigController>()), | 253 cast_config_(base::MakeUnique<CastConfigController>()), |
| 252 focus_cycler_(base::MakeUnique<FocusCycler>()), | 254 focus_cycler_(base::MakeUnique<FocusCycler>()), |
| 253 immersive_context_(base::MakeUnique<ImmersiveContextAsh>()), | 255 immersive_context_(base::MakeUnique<ImmersiveContextAsh>()), |
| 254 locale_notification_controller_( | 256 locale_notification_controller_( |
| 255 base::MakeUnique<LocaleNotificationController>()), | 257 base::MakeUnique<LocaleNotificationController>()), |
| 256 new_window_controller_(base::MakeUnique<NewWindowController>()), | 258 new_window_controller_(base::MakeUnique<NewWindowController>()), |
| 257 shelf_controller_(base::MakeUnique<ShelfController>()), | 259 shelf_controller_(base::MakeUnique<ShelfController>()), |
| 258 shutdown_controller_(base::MakeUnique<ShutdownController>()), | 260 shutdown_controller_(base::MakeUnique<ShutdownController>()), |
| 259 system_tray_controller_(base::MakeUnique<SystemTrayController>()), | 261 system_tray_controller_(base::MakeUnique<SystemTrayController>()), |
| 260 system_tray_notifier_(base::MakeUnique<SystemTrayNotifier>()), | 262 system_tray_notifier_(base::MakeUnique<SystemTrayNotifier>()), |
| (...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 404 void WmShell::DeleteToastManager() { | 406 void WmShell::DeleteToastManager() { |
| 405 toast_manager_.reset(); | 407 toast_manager_.reset(); |
| 406 } | 408 } |
| 407 | 409 |
| 408 void WmShell::SetAcceleratorController( | 410 void WmShell::SetAcceleratorController( |
| 409 std::unique_ptr<AcceleratorController> accelerator_controller) { | 411 std::unique_ptr<AcceleratorController> accelerator_controller) { |
| 410 accelerator_controller_ = std::move(accelerator_controller); | 412 accelerator_controller_ = std::move(accelerator_controller); |
| 411 } | 413 } |
| 412 | 414 |
| 413 } // namespace ash | 415 } // namespace ash |
| OLD | NEW |