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

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

Issue 2420753002: ash: Use mojo LocaleNotificationController interface. (Closed)
Patch Set: Remove dead code + cl lint Created 4 years, 2 months 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 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 224
225 void WmShell::SetPaletteDelegateForTesting( 225 void WmShell::SetPaletteDelegateForTesting(
226 std::unique_ptr<PaletteDelegate> palette_delegate) { 226 std::unique_ptr<PaletteDelegate> palette_delegate) {
227 palette_delegate_ = std::move(palette_delegate); 227 palette_delegate_ = std::move(palette_delegate);
228 } 228 }
229 229
230 WmShell::WmShell(std::unique_ptr<ShellDelegate> shell_delegate) 230 WmShell::WmShell(std::unique_ptr<ShellDelegate> shell_delegate)
231 : delegate_(std::move(shell_delegate)), 231 : delegate_(std::move(shell_delegate)),
232 focus_cycler_(base::MakeUnique<FocusCycler>()), 232 focus_cycler_(base::MakeUnique<FocusCycler>()),
233 immersive_context_(base::MakeUnique<ImmersiveContextAsh>()), 233 immersive_context_(base::MakeUnique<ImmersiveContextAsh>()),
234 locale_notification_controller_(
235 base::MakeUnique<LocaleNotificationController>()),
234 shelf_controller_(base::MakeUnique<ShelfController>()), 236 shelf_controller_(base::MakeUnique<ShelfController>()),
235 system_tray_controller_(base::MakeUnique<SystemTrayController>( 237 system_tray_controller_(base::MakeUnique<SystemTrayController>(
236 delegate_->GetShellConnector())), 238 delegate_->GetShellConnector())),
237 system_tray_notifier_(base::MakeUnique<SystemTrayNotifier>()), 239 system_tray_notifier_(base::MakeUnique<SystemTrayNotifier>()),
238 wallpaper_delegate_(delegate_->CreateWallpaperDelegate()), 240 wallpaper_delegate_(delegate_->CreateWallpaperDelegate()),
239 window_cycle_controller_(base::MakeUnique<WindowCycleController>()), 241 window_cycle_controller_(base::MakeUnique<WindowCycleController>()),
240 window_selector_controller_( 242 window_selector_controller_(
241 base::MakeUnique<WindowSelectorController>()) { 243 base::MakeUnique<WindowSelectorController>()) {
242 #if defined(OS_CHROMEOS) 244 #if defined(OS_CHROMEOS)
243 brightness_control_delegate_.reset(new system::BrightnessControllerChromeos); 245 brightness_control_delegate_.reset(new system::BrightnessControllerChromeos);
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
378 void WmShell::DeleteToastManager() { 380 void WmShell::DeleteToastManager() {
379 toast_manager_.reset(); 381 toast_manager_.reset();
380 } 382 }
381 383
382 void WmShell::SetAcceleratorController( 384 void WmShell::SetAcceleratorController(
383 std::unique_ptr<AcceleratorController> accelerator_controller) { 385 std::unique_ptr<AcceleratorController> accelerator_controller) {
384 accelerator_controller_ = std::move(accelerator_controller); 386 accelerator_controller_ = std::move(accelerator_controller);
385 } 387 }
386 388
387 } // namespace ash 389 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698