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

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

Issue 2525563003: mash: Change CastConfigDelegate to a mojoified CastConfigClient. (Closed)
Patch Set: move dep to chromeos section 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
« 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/cast_config_controller.h"
12 #include "ash/common/devtools/ash_devtools_css_agent.h" 13 #include "ash/common/devtools/ash_devtools_css_agent.h"
13 #include "ash/common/devtools/ash_devtools_dom_agent.h" 14 #include "ash/common/devtools/ash_devtools_dom_agent.h"
14 #include "ash/common/focus_cycler.h" 15 #include "ash/common/focus_cycler.h"
15 #include "ash/common/keyboard/keyboard_ui.h" 16 #include "ash/common/keyboard/keyboard_ui.h"
16 #include "ash/common/new_window_client_proxy.h" 17 #include "ash/common/new_window_client_proxy.h"
17 #include "ash/common/palette_delegate.h" 18 #include "ash/common/palette_delegate.h"
18 #include "ash/common/session/session_state_delegate.h" 19 #include "ash/common/session/session_state_delegate.h"
19 #include "ash/common/shelf/app_list_shelf_item_delegate.h" 20 #include "ash/common/shelf/app_list_shelf_item_delegate.h"
20 #include "ash/common/shelf/shelf_controller.h" 21 #include "ash/common/shelf/shelf_controller.h"
21 #include "ash/common/shelf/shelf_delegate.h" 22 #include "ash/common/shelf/shelf_delegate.h"
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 shelf_delegate_ = std::move(test_delegate); 241 shelf_delegate_ = std::move(test_delegate);
241 } 242 }
242 243
243 void WmShell::SetPaletteDelegateForTesting( 244 void WmShell::SetPaletteDelegateForTesting(
244 std::unique_ptr<PaletteDelegate> palette_delegate) { 245 std::unique_ptr<PaletteDelegate> palette_delegate) {
245 palette_delegate_ = std::move(palette_delegate); 246 palette_delegate_ = std::move(palette_delegate);
246 } 247 }
247 248
248 WmShell::WmShell(std::unique_ptr<ShellDelegate> shell_delegate) 249 WmShell::WmShell(std::unique_ptr<ShellDelegate> shell_delegate)
249 : delegate_(std::move(shell_delegate)), 250 : delegate_(std::move(shell_delegate)),
251 cast_config_(base::MakeUnique<CastConfigController>()),
250 focus_cycler_(base::MakeUnique<FocusCycler>()), 252 focus_cycler_(base::MakeUnique<FocusCycler>()),
251 immersive_context_(base::MakeUnique<ImmersiveContextAsh>()), 253 immersive_context_(base::MakeUnique<ImmersiveContextAsh>()),
252 locale_notification_controller_( 254 locale_notification_controller_(
253 base::MakeUnique<LocaleNotificationController>()), 255 base::MakeUnique<LocaleNotificationController>()),
254 new_window_client_(base::MakeUnique<NewWindowClientProxy>( 256 new_window_client_(base::MakeUnique<NewWindowClientProxy>(
255 delegate_->GetShellConnector())), 257 delegate_->GetShellConnector())),
256 shelf_controller_(base::MakeUnique<ShelfController>()), 258 shelf_controller_(base::MakeUnique<ShelfController>()),
257 shutdown_controller_(base::MakeUnique<ShutdownController>()), 259 shutdown_controller_(base::MakeUnique<ShutdownController>()),
258 system_tray_controller_(base::MakeUnique<SystemTrayController>()), 260 system_tray_controller_(base::MakeUnique<SystemTrayController>()),
259 system_tray_notifier_(base::MakeUnique<SystemTrayNotifier>()), 261 system_tray_notifier_(base::MakeUnique<SystemTrayNotifier>()),
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
403 void WmShell::DeleteToastManager() { 405 void WmShell::DeleteToastManager() {
404 toast_manager_.reset(); 406 toast_manager_.reset();
405 } 407 }
406 408
407 void WmShell::SetAcceleratorController( 409 void WmShell::SetAcceleratorController(
408 std::unique_ptr<AcceleratorController> accelerator_controller) { 410 std::unique_ptr<AcceleratorController> accelerator_controller) {
409 accelerator_controller_ = std::move(accelerator_controller); 411 accelerator_controller_ = std::move(accelerator_controller);
410 } 412 }
411 413
412 } // namespace ash 414 } // 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