| 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/focus_cycler.h" | 12 #include "ash/common/focus_cycler.h" |
| 13 #include "ash/common/keyboard/keyboard_ui.h" | 13 #include "ash/common/keyboard/keyboard_ui.h" |
| 14 #include "ash/common/new_window_delegate.h" | 14 #include "ash/common/new_window_delegate.h" |
| 15 #include "ash/common/palette_delegate.h" | 15 #include "ash/common/palette_delegate.h" |
| 16 #include "ash/common/session/session_state_delegate.h" | 16 #include "ash/common/session/session_state_delegate.h" |
| 17 #include "ash/common/shelf/app_list_shelf_item_delegate.h" | 17 #include "ash/common/shelf/app_list_shelf_item_delegate.h" |
| 18 #include "ash/common/shelf/shelf_delegate.h" | 18 #include "ash/common/shelf/shelf_delegate.h" |
| 19 #include "ash/common/shelf/shelf_model.h" | 19 #include "ash/common/shelf/shelf_model.h" |
| 20 #include "ash/common/shelf/shelf_window_watcher.h" | 20 #include "ash/common/shelf/shelf_window_watcher.h" |
| 21 #include "ash/common/shell_delegate.h" | 21 #include "ash/common/shell_delegate.h" |
| 22 #include "ash/common/shell_window_ids.h" | 22 #include "ash/common/shell_window_ids.h" |
| 23 #include "ash/common/system/brightness_control_delegate.h" | 23 #include "ash/common/system/brightness_control_delegate.h" |
| 24 #include "ash/common/system/keyboard_brightness_control_delegate.h" | 24 #include "ash/common/system/keyboard_brightness_control_delegate.h" |
| 25 #include "ash/common/system/toast/toast_manager.h" | 25 #include "ash/common/system/toast/toast_manager.h" |
| 26 #include "ash/common/system/tray/system_tray_delegate.h" | 26 #include "ash/common/system/tray/system_tray_delegate.h" |
| 27 #include "ash/common/system/tray/system_tray_notifier.h" | 27 #include "ash/common/system/tray/system_tray_notifier.h" |
| 28 #include "ash/common/wallpaper/wallpaper_delegate.h" |
| 28 #include "ash/common/wm/immersive_context_ash.h" | 29 #include "ash/common/wm/immersive_context_ash.h" |
| 29 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h" | 30 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h" |
| 30 #include "ash/common/wm/mru_window_tracker.h" | 31 #include "ash/common/wm/mru_window_tracker.h" |
| 31 #include "ash/common/wm/overview/window_selector_controller.h" | 32 #include "ash/common/wm/overview/window_selector_controller.h" |
| 32 #include "ash/common/wm/window_cycle_controller.h" | 33 #include "ash/common/wm/window_cycle_controller.h" |
| 33 #include "ash/common/wm_window.h" | 34 #include "ash/common/wm_window.h" |
| 34 #include "base/bind.h" | 35 #include "base/bind.h" |
| 35 #include "base/logging.h" | 36 #include "base/logging.h" |
| 36 #include "base/memory/ptr_util.h" | 37 #include "base/memory/ptr_util.h" |
| 37 #include "ui/app_list/presenter/app_list_presenter.h" | 38 #include "ui/app_list/presenter/app_list_presenter.h" |
| (...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 174 std::unique_ptr<PaletteDelegate> palette_delegate) { | 175 std::unique_ptr<PaletteDelegate> palette_delegate) { |
| 175 palette_delegate_ = std::move(palette_delegate); | 176 palette_delegate_ = std::move(palette_delegate); |
| 176 } | 177 } |
| 177 | 178 |
| 178 WmShell::WmShell(std::unique_ptr<ShellDelegate> shell_delegate) | 179 WmShell::WmShell(std::unique_ptr<ShellDelegate> shell_delegate) |
| 179 : delegate_(std::move(shell_delegate)), | 180 : delegate_(std::move(shell_delegate)), |
| 180 focus_cycler_(new FocusCycler), | 181 focus_cycler_(new FocusCycler), |
| 181 immersive_context_(base::MakeUnique<ImmersiveContextAsh>()), | 182 immersive_context_(base::MakeUnique<ImmersiveContextAsh>()), |
| 182 shelf_model_(new ShelfModel), // Must create before ShelfDelegate. | 183 shelf_model_(new ShelfModel), // Must create before ShelfDelegate. |
| 183 system_tray_notifier_(new SystemTrayNotifier), | 184 system_tray_notifier_(new SystemTrayNotifier), |
| 185 wallpaper_delegate_(delegate_->CreateWallpaperDelegate()), |
| 184 window_cycle_controller_(new WindowCycleController), | 186 window_cycle_controller_(new WindowCycleController), |
| 185 window_selector_controller_(new WindowSelectorController) { | 187 window_selector_controller_(new WindowSelectorController) { |
| 186 #if defined(OS_CHROMEOS) | 188 #if defined(OS_CHROMEOS) |
| 187 brightness_control_delegate_.reset(new system::BrightnessControllerChromeos); | 189 brightness_control_delegate_.reset(new system::BrightnessControllerChromeos); |
| 188 keyboard_brightness_control_delegate_.reset(new KeyboardBrightnessController); | 190 keyboard_brightness_control_delegate_.reset(new KeyboardBrightnessController); |
| 189 #endif | 191 #endif |
| 190 } | 192 } |
| 191 | 193 |
| 192 WmShell::~WmShell() {} | 194 WmShell::~WmShell() {} |
| 193 | 195 |
| (...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 296 void WmShell::DeleteToastManager() { | 298 void WmShell::DeleteToastManager() { |
| 297 toast_manager_.reset(); | 299 toast_manager_.reset(); |
| 298 } | 300 } |
| 299 | 301 |
| 300 void WmShell::SetAcceleratorController( | 302 void WmShell::SetAcceleratorController( |
| 301 std::unique_ptr<AcceleratorController> accelerator_controller) { | 303 std::unique_ptr<AcceleratorController> accelerator_controller) { |
| 302 accelerator_controller_ = std::move(accelerator_controller); | 304 accelerator_controller_ = std::move(accelerator_controller); |
| 303 } | 305 } |
| 304 | 306 |
| 305 } // namespace ash | 307 } // namespace ash |
| OLD | NEW |