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.h

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/system/tray/system_tray_delegate.cc ('k') | ash/common/wm_shell.cc » ('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 #ifndef ASH_COMMON_WM_SHELL_H_ 5 #ifndef ASH_COMMON_WM_SHELL_H_
6 #define ASH_COMMON_WM_SHELL_H_ 6 #define ASH_COMMON_WM_SHELL_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 26 matching lines...) Expand all
37 37
38 namespace views { 38 namespace views {
39 class PointerWatcher; 39 class PointerWatcher;
40 enum class PointerWatcherEventTypes; 40 enum class PointerWatcherEventTypes;
41 } 41 }
42 42
43 namespace ash { 43 namespace ash {
44 class AcceleratorController; 44 class AcceleratorController;
45 class AccessibilityDelegate; 45 class AccessibilityDelegate;
46 class BrightnessControlDelegate; 46 class BrightnessControlDelegate;
47 class CastConfigController;
47 class FocusCycler; 48 class FocusCycler;
48 class ImmersiveContextAsh; 49 class ImmersiveContextAsh;
49 class ImmersiveFullscreenController; 50 class ImmersiveFullscreenController;
50 class KeyEventWatcher; 51 class KeyEventWatcher;
51 class KeyboardBrightnessControlDelegate; 52 class KeyboardBrightnessControlDelegate;
52 class KeyboardUI; 53 class KeyboardUI;
53 class LocaleNotificationController; 54 class LocaleNotificationController;
54 class MaximizeModeController; 55 class MaximizeModeController;
55 class MruWindowTracker; 56 class MruWindowTracker;
56 class PaletteDelegate; 57 class PaletteDelegate;
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 } 116 }
116 117
117 AccessibilityDelegate* accessibility_delegate() { 118 AccessibilityDelegate* accessibility_delegate() {
118 return accessibility_delegate_.get(); 119 return accessibility_delegate_.get();
119 } 120 }
120 121
121 BrightnessControlDelegate* brightness_control_delegate() { 122 BrightnessControlDelegate* brightness_control_delegate() {
122 return brightness_control_delegate_.get(); 123 return brightness_control_delegate_.get();
123 } 124 }
124 125
126 CastConfigController* cast_config() { return cast_config_.get(); }
127
125 FocusCycler* focus_cycler() { return focus_cycler_.get(); } 128 FocusCycler* focus_cycler() { return focus_cycler_.get(); }
126 129
127 KeyboardBrightnessControlDelegate* keyboard_brightness_control_delegate() { 130 KeyboardBrightnessControlDelegate* keyboard_brightness_control_delegate() {
128 return keyboard_brightness_control_delegate_.get(); 131 return keyboard_brightness_control_delegate_.get();
129 } 132 }
130 133
131 KeyboardUI* keyboard_ui() { return keyboard_ui_.get(); } 134 KeyboardUI* keyboard_ui() { return keyboard_ui_.get(); }
132 135
133 LocaleNotificationController* locale_notification_controller() { 136 LocaleNotificationController* locale_notification_controller() {
134 return locale_notification_controller_.get(); 137 return locale_notification_controller_.get();
(...skipping 337 matching lines...) Expand 10 before | Expand all | Expand 10 after
472 friend class WmShellTestApi; 475 friend class WmShellTestApi;
473 476
474 static WmShell* instance_; 477 static WmShell* instance_;
475 478
476 base::ObserverList<ShellObserver> shell_observers_; 479 base::ObserverList<ShellObserver> shell_observers_;
477 std::unique_ptr<ShellDelegate> delegate_; 480 std::unique_ptr<ShellDelegate> delegate_;
478 481
479 std::unique_ptr<AcceleratorController> accelerator_controller_; 482 std::unique_ptr<AcceleratorController> accelerator_controller_;
480 std::unique_ptr<AccessibilityDelegate> accessibility_delegate_; 483 std::unique_ptr<AccessibilityDelegate> accessibility_delegate_;
481 std::unique_ptr<BrightnessControlDelegate> brightness_control_delegate_; 484 std::unique_ptr<BrightnessControlDelegate> brightness_control_delegate_;
485 std::unique_ptr<CastConfigController> cast_config_;
482 std::unique_ptr<FocusCycler> focus_cycler_; 486 std::unique_ptr<FocusCycler> focus_cycler_;
483 std::unique_ptr<ImmersiveContextAsh> immersive_context_; 487 std::unique_ptr<ImmersiveContextAsh> immersive_context_;
484 std::unique_ptr<KeyboardBrightnessControlDelegate> 488 std::unique_ptr<KeyboardBrightnessControlDelegate>
485 keyboard_brightness_control_delegate_; 489 keyboard_brightness_control_delegate_;
486 std::unique_ptr<KeyboardUI> keyboard_ui_; 490 std::unique_ptr<KeyboardUI> keyboard_ui_;
487 std::unique_ptr<LocaleNotificationController> locale_notification_controller_; 491 std::unique_ptr<LocaleNotificationController> locale_notification_controller_;
488 std::unique_ptr<MaximizeModeController> maximize_mode_controller_; 492 std::unique_ptr<MaximizeModeController> maximize_mode_controller_;
489 std::unique_ptr<MediaDelegate> media_delegate_; 493 std::unique_ptr<MediaDelegate> media_delegate_;
490 std::unique_ptr<MruWindowTracker> mru_window_tracker_; 494 std::unique_ptr<MruWindowTracker> mru_window_tracker_;
491 std::unique_ptr<mojom::NewWindowClient> new_window_client_; 495 std::unique_ptr<mojom::NewWindowClient> new_window_client_;
(...skipping 24 matching lines...) Expand all
516 520
517 #if defined(OS_CHROMEOS) 521 #if defined(OS_CHROMEOS)
518 std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_; 522 std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_;
519 std::unique_ptr<VpnList> vpn_list_; 523 std::unique_ptr<VpnList> vpn_list_;
520 #endif 524 #endif
521 }; 525 };
522 526
523 } // namespace ash 527 } // namespace ash
524 528
525 #endif // ASH_COMMON_WM_SHELL_H_ 529 #endif // ASH_COMMON_WM_SHELL_H_
OLDNEW
« no previous file with comments | « ash/common/system/tray/system_tray_delegate.cc ('k') | ash/common/wm_shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698