Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(36)

Side by Side Diff: ash/common/wm_shell.cc

Issue 2525813004: chromeos: Introduce SetClient() on ash::mojom::SystemTray interface (Closed)
Patch Set: Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
247 WmShell::WmShell(std::unique_ptr<ShellDelegate> shell_delegate) 247 WmShell::WmShell(std::unique_ptr<ShellDelegate> shell_delegate)
248 : delegate_(std::move(shell_delegate)), 248 : delegate_(std::move(shell_delegate)),
249 focus_cycler_(base::MakeUnique<FocusCycler>()), 249 focus_cycler_(base::MakeUnique<FocusCycler>()),
250 immersive_context_(base::MakeUnique<ImmersiveContextAsh>()), 250 immersive_context_(base::MakeUnique<ImmersiveContextAsh>()),
251 locale_notification_controller_( 251 locale_notification_controller_(
252 base::MakeUnique<LocaleNotificationController>()), 252 base::MakeUnique<LocaleNotificationController>()),
253 new_window_client_(base::MakeUnique<NewWindowClientProxy>( 253 new_window_client_(base::MakeUnique<NewWindowClientProxy>(
254 delegate_->GetShellConnector())), 254 delegate_->GetShellConnector())),
255 shelf_controller_(base::MakeUnique<ShelfController>()), 255 shelf_controller_(base::MakeUnique<ShelfController>()),
256 shutdown_controller_(base::MakeUnique<ShutdownController>()), 256 shutdown_controller_(base::MakeUnique<ShutdownController>()),
257 system_tray_controller_(base::MakeUnique<SystemTrayController>( 257 system_tray_controller_(base::MakeUnique<SystemTrayController>()),
258 delegate_->GetShellConnector())),
259 system_tray_notifier_(base::MakeUnique<SystemTrayNotifier>()), 258 system_tray_notifier_(base::MakeUnique<SystemTrayNotifier>()),
260 wallpaper_delegate_(delegate_->CreateWallpaperDelegate()), 259 wallpaper_delegate_(delegate_->CreateWallpaperDelegate()),
261 window_cycle_controller_(base::MakeUnique<WindowCycleController>()), 260 window_cycle_controller_(base::MakeUnique<WindowCycleController>()),
262 window_selector_controller_( 261 window_selector_controller_(
263 base::MakeUnique<WindowSelectorController>()) { 262 base::MakeUnique<WindowSelectorController>()) {
264 #if defined(OS_CHROMEOS) 263 #if defined(OS_CHROMEOS)
265 brightness_control_delegate_.reset(new system::BrightnessControllerChromeos); 264 brightness_control_delegate_.reset(new system::BrightnessControllerChromeos);
266 keyboard_brightness_control_delegate_.reset(new KeyboardBrightnessController); 265 keyboard_brightness_control_delegate_.reset(new KeyboardBrightnessController);
267 #endif 266 #endif
268 } 267 }
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
402 void WmShell::DeleteToastManager() { 401 void WmShell::DeleteToastManager() {
403 toast_manager_.reset(); 402 toast_manager_.reset();
404 } 403 }
405 404
406 void WmShell::SetAcceleratorController( 405 void WmShell::SetAcceleratorController(
407 std::unique_ptr<AcceleratorController> accelerator_controller) { 406 std::unique_ptr<AcceleratorController> accelerator_controller) {
408 accelerator_controller_ = std::move(accelerator_controller); 407 accelerator_controller_ = std::move(accelerator_controller);
409 } 408 }
410 409
411 } // namespace ash 410 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698