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

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

Issue 2420753002: ash: Use mojo LocaleNotificationController interface. (Closed)
Patch Set: Uniquify callbacks 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
« no previous file with comments | « ash/common/wm_shell.h ('k') | ash/mus/manifest.json » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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"
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_controller.h" 18 #include "ash/common/shelf/shelf_controller.h"
19 #include "ash/common/shelf/shelf_delegate.h" 19 #include "ash/common/shelf/shelf_delegate.h"
20 #include "ash/common/shelf/shelf_model.h" 20 #include "ash/common/shelf/shelf_model.h"
21 #include "ash/common/shelf/shelf_window_watcher.h" 21 #include "ash/common/shelf/shelf_window_watcher.h"
22 #include "ash/common/shell_delegate.h" 22 #include "ash/common/shell_delegate.h"
23 #include "ash/common/shell_window_ids.h" 23 #include "ash/common/shell_window_ids.h"
24 #include "ash/common/system/brightness_control_delegate.h" 24 #include "ash/common/system/brightness_control_delegate.h"
25 #include "ash/common/system/keyboard_brightness_control_delegate.h" 25 #include "ash/common/system/keyboard_brightness_control_delegate.h"
26 #include "ash/common/system/locale/locale_notification_controller.h"
26 #include "ash/common/system/toast/toast_manager.h" 27 #include "ash/common/system/toast/toast_manager.h"
27 #include "ash/common/system/tray/system_tray_controller.h" 28 #include "ash/common/system/tray/system_tray_controller.h"
28 #include "ash/common/system/tray/system_tray_delegate.h" 29 #include "ash/common/system/tray/system_tray_delegate.h"
29 #include "ash/common/system/tray/system_tray_notifier.h" 30 #include "ash/common/system/tray/system_tray_notifier.h"
30 #include "ash/common/wallpaper/wallpaper_controller.h" 31 #include "ash/common/wallpaper/wallpaper_controller.h"
31 #include "ash/common/wallpaper/wallpaper_delegate.h" 32 #include "ash/common/wallpaper/wallpaper_delegate.h"
32 #include "ash/common/wm/immersive_context_ash.h" 33 #include "ash/common/wm/immersive_context_ash.h"
33 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h" 34 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
34 #include "ash/common/wm/mru_window_tracker.h" 35 #include "ash/common/wm/mru_window_tracker.h"
35 #include "ash/common/wm/overview/window_selector_controller.h" 36 #include "ash/common/wm/overview/window_selector_controller.h"
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 227
227 void WmShell::SetPaletteDelegateForTesting( 228 void WmShell::SetPaletteDelegateForTesting(
228 std::unique_ptr<PaletteDelegate> palette_delegate) { 229 std::unique_ptr<PaletteDelegate> palette_delegate) {
229 palette_delegate_ = std::move(palette_delegate); 230 palette_delegate_ = std::move(palette_delegate);
230 } 231 }
231 232
232 WmShell::WmShell(std::unique_ptr<ShellDelegate> shell_delegate) 233 WmShell::WmShell(std::unique_ptr<ShellDelegate> shell_delegate)
233 : delegate_(std::move(shell_delegate)), 234 : delegate_(std::move(shell_delegate)),
234 focus_cycler_(base::MakeUnique<FocusCycler>()), 235 focus_cycler_(base::MakeUnique<FocusCycler>()),
235 immersive_context_(base::MakeUnique<ImmersiveContextAsh>()), 236 immersive_context_(base::MakeUnique<ImmersiveContextAsh>()),
237 locale_notification_controller_(
238 base::MakeUnique<LocaleNotificationController>()),
236 shelf_controller_(base::MakeUnique<ShelfController>()), 239 shelf_controller_(base::MakeUnique<ShelfController>()),
237 system_tray_controller_(base::MakeUnique<SystemTrayController>( 240 system_tray_controller_(base::MakeUnique<SystemTrayController>(
238 delegate_->GetShellConnector())), 241 delegate_->GetShellConnector())),
239 system_tray_notifier_(base::MakeUnique<SystemTrayNotifier>()), 242 system_tray_notifier_(base::MakeUnique<SystemTrayNotifier>()),
240 wallpaper_delegate_(delegate_->CreateWallpaperDelegate()), 243 wallpaper_delegate_(delegate_->CreateWallpaperDelegate()),
241 window_cycle_controller_(base::MakeUnique<WindowCycleController>()), 244 window_cycle_controller_(base::MakeUnique<WindowCycleController>()),
242 window_selector_controller_( 245 window_selector_controller_(
243 base::MakeUnique<WindowSelectorController>()) { 246 base::MakeUnique<WindowSelectorController>()) {
244 #if defined(OS_CHROMEOS) 247 #if defined(OS_CHROMEOS)
245 brightness_control_delegate_.reset(new system::BrightnessControllerChromeos); 248 brightness_control_delegate_.reset(new system::BrightnessControllerChromeos);
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
380 void WmShell::DeleteToastManager() { 383 void WmShell::DeleteToastManager() {
381 toast_manager_.reset(); 384 toast_manager_.reset();
382 } 385 }
383 386
384 void WmShell::SetAcceleratorController( 387 void WmShell::SetAcceleratorController(
385 std::unique_ptr<AcceleratorController> accelerator_controller) { 388 std::unique_ptr<AcceleratorController> accelerator_controller) {
386 accelerator_controller_ = std::move(accelerator_controller); 389 accelerator_controller_ = std::move(accelerator_controller);
387 } 390 }
388 391
389 } // namespace ash 392 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/wm_shell.h ('k') | ash/mus/manifest.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698