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

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

Issue 2525563003: mash: Change CastConfigDelegate to a mojoified CastConfigClient. (Closed)
Patch Set: Now for the external apitests as well. 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"
11 #include "ash/common/accessibility_delegate.h" 11 #include "ash/common/accessibility_delegate.h"
12 #include "ash/common/cast_config_client_proxy.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 13 matching lines...) Expand all
35 #include "ash/common/wm/immersive_context_ash.h" 36 #include "ash/common/wm/immersive_context_ash.h"
36 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h" 37 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
37 #include "ash/common/wm/mru_window_tracker.h" 38 #include "ash/common/wm/mru_window_tracker.h"
38 #include "ash/common/wm/overview/window_selector_controller.h" 39 #include "ash/common/wm/overview/window_selector_controller.h"
39 #include "ash/common/wm/root_window_finder.h" 40 #include "ash/common/wm/root_window_finder.h"
40 #include "ash/common/wm/system_modal_container_layout_manager.h" 41 #include "ash/common/wm/system_modal_container_layout_manager.h"
41 #include "ash/common/wm/window_cycle_controller.h" 42 #include "ash/common/wm/window_cycle_controller.h"
42 #include "ash/common/wm_root_window_controller.h" 43 #include "ash/common/wm_root_window_controller.h"
43 #include "ash/common/wm_window.h" 44 #include "ash/common/wm_window.h"
44 #include "ash/public/cpp/shell_window_ids.h" 45 #include "ash/public/cpp/shell_window_ids.h"
46 #include "ash/public/interfaces/cast_config.mojom.h"
45 #include "base/bind.h" 47 #include "base/bind.h"
46 #include "base/logging.h" 48 #include "base/logging.h"
47 #include "base/memory/ptr_util.h" 49 #include "base/memory/ptr_util.h"
48 #include "ui/app_list/presenter/app_list_presenter.h" 50 #include "ui/app_list/presenter/app_list_presenter.h"
49 #include "ui/display/display.h" 51 #include "ui/display/display.h"
50 #include "ui/views/focus/focus_manager_factory.h" 52 #include "ui/views/focus/focus_manager_factory.h"
51 53
52 #if defined(OS_CHROMEOS) 54 #if defined(OS_CHROMEOS)
53 #include "ash/common/system/chromeos/brightness/brightness_controller_chromeos.h " 55 #include "ash/common/system/chromeos/brightness/brightness_controller_chromeos.h "
54 #include "ash/common/system/chromeos/keyboard_brightness_controller.h" 56 #include "ash/common/system/chromeos/keyboard_brightness_controller.h"
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 shelf_delegate_ = std::move(test_delegate); 242 shelf_delegate_ = std::move(test_delegate);
241 } 243 }
242 244
243 void WmShell::SetPaletteDelegateForTesting( 245 void WmShell::SetPaletteDelegateForTesting(
244 std::unique_ptr<PaletteDelegate> palette_delegate) { 246 std::unique_ptr<PaletteDelegate> palette_delegate) {
245 palette_delegate_ = std::move(palette_delegate); 247 palette_delegate_ = std::move(palette_delegate);
246 } 248 }
247 249
248 WmShell::WmShell(std::unique_ptr<ShellDelegate> shell_delegate) 250 WmShell::WmShell(std::unique_ptr<ShellDelegate> shell_delegate)
249 : delegate_(std::move(shell_delegate)), 251 : delegate_(std::move(shell_delegate)),
252 cast_config_client_(base::MakeUnique<CastConfigClientProxy>(
253 delegate_->GetShellConnector())),
250 focus_cycler_(base::MakeUnique<FocusCycler>()), 254 focus_cycler_(base::MakeUnique<FocusCycler>()),
251 immersive_context_(base::MakeUnique<ImmersiveContextAsh>()), 255 immersive_context_(base::MakeUnique<ImmersiveContextAsh>()),
252 locale_notification_controller_( 256 locale_notification_controller_(
253 base::MakeUnique<LocaleNotificationController>()), 257 base::MakeUnique<LocaleNotificationController>()),
254 new_window_client_(base::MakeUnique<NewWindowClientProxy>( 258 new_window_client_(base::MakeUnique<NewWindowClientProxy>(
255 delegate_->GetShellConnector())), 259 delegate_->GetShellConnector())),
256 shelf_controller_(base::MakeUnique<ShelfController>()), 260 shelf_controller_(base::MakeUnique<ShelfController>()),
257 shutdown_controller_(base::MakeUnique<ShutdownController>()), 261 shutdown_controller_(base::MakeUnique<ShutdownController>()),
258 system_tray_controller_(base::MakeUnique<SystemTrayController>()), 262 system_tray_controller_(base::MakeUnique<SystemTrayController>()),
259 system_tray_notifier_(base::MakeUnique<SystemTrayNotifier>()), 263 system_tray_notifier_(base::MakeUnique<SystemTrayNotifier>()),
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
403 void WmShell::DeleteToastManager() { 407 void WmShell::DeleteToastManager() {
404 toast_manager_.reset(); 408 toast_manager_.reset();
405 } 409 }
406 410
407 void WmShell::SetAcceleratorController( 411 void WmShell::SetAcceleratorController(
408 std::unique_ptr<AcceleratorController> accelerator_controller) { 412 std::unique_ptr<AcceleratorController> accelerator_controller) {
409 accelerator_controller_ = std::move(accelerator_controller); 413 accelerator_controller_ = std::move(accelerator_controller);
410 } 414 }
411 415
412 } // namespace ash 416 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698