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

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

Issue 2171493002: Moves ToastManager from Shell to WmShell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove include Created 4 years, 5 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/accelerators/debug_commands.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 17 matching lines...) Expand all
28 class KeyboardBrightnessControlDelegate; 28 class KeyboardBrightnessControlDelegate;
29 class KeyboardUI; 29 class KeyboardUI;
30 class MaximizeModeController; 30 class MaximizeModeController;
31 class MruWindowTracker; 31 class MruWindowTracker;
32 class ScopedDisableInternalMouseAndKeyboard; 32 class ScopedDisableInternalMouseAndKeyboard;
33 class SessionStateDelegate; 33 class SessionStateDelegate;
34 class ShellDelegate; 34 class ShellDelegate;
35 class ShellObserver; 35 class ShellObserver;
36 class SystemTrayDelegate; 36 class SystemTrayDelegate;
37 class SystemTrayNotifier; 37 class SystemTrayNotifier;
38 class ToastManager;
38 class WindowCycleController; 39 class WindowCycleController;
39 class WindowCycleEventFilter; 40 class WindowCycleEventFilter;
40 class WindowResizer; 41 class WindowResizer;
41 class WindowSelectorController; 42 class WindowSelectorController;
42 class WmActivationObserver; 43 class WmActivationObserver;
43 class WmDisplayObserver; 44 class WmDisplayObserver;
44 class WmWindow; 45 class WmWindow;
45 46
46 enum class TaskSwitchSource; 47 enum class TaskSwitchSource;
47 48
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 MediaDelegate* media_delegate() { return media_delegate_.get(); } 94 MediaDelegate* media_delegate() { return media_delegate_.get(); }
94 95
95 SystemTrayNotifier* system_tray_notifier() { 96 SystemTrayNotifier* system_tray_notifier() {
96 return system_tray_notifier_.get(); 97 return system_tray_notifier_.get();
97 } 98 }
98 99
99 SystemTrayDelegate* system_tray_delegate() { 100 SystemTrayDelegate* system_tray_delegate() {
100 return system_tray_delegate_.get(); 101 return system_tray_delegate_.get();
101 } 102 }
102 103
104 ToastManager* toast_manager() { return toast_manager_.get(); }
105
103 WindowCycleController* window_cycle_controller() { 106 WindowCycleController* window_cycle_controller() {
104 return window_cycle_controller_.get(); 107 return window_cycle_controller_.get();
105 } 108 }
106 109
107 WindowSelectorController* window_selector_controller() { 110 WindowSelectorController* window_selector_controller() {
108 return window_selector_controller_.get(); 111 return window_selector_controller_.get();
109 } 112 }
110 113
111 // Creates a new window used as a container of other windows. No painting is 114 // Creates a new window used as a container of other windows. No painting is
112 // done to the created window. 115 // done to the created window.
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 void DeleteWindowCycleController(); 255 void DeleteWindowCycleController();
253 256
254 void DeleteWindowSelectorController(); 257 void DeleteWindowSelectorController();
255 258
256 void CreateMaximizeModeController(); 259 void CreateMaximizeModeController();
257 void DeleteMaximizeModeController(); 260 void DeleteMaximizeModeController();
258 261
259 void CreateMruWindowTracker(); 262 void CreateMruWindowTracker();
260 void DeleteMruWindowTracker(); 263 void DeleteMruWindowTracker();
261 264
265 void DeleteToastManager();
266
262 private: 267 private:
263 friend class AcceleratorControllerTest; 268 friend class AcceleratorControllerTest;
264 friend class Shell; 269 friend class Shell;
265 270
266 static WmShell* instance_; 271 static WmShell* instance_;
267 272
268 base::ObserverList<ShellObserver> shell_observers_; 273 base::ObserverList<ShellObserver> shell_observers_;
269 std::unique_ptr<ShellDelegate> delegate_; 274 std::unique_ptr<ShellDelegate> delegate_;
270 275
271 std::unique_ptr<AccessibilityDelegate> accessibility_delegate_; 276 std::unique_ptr<AccessibilityDelegate> accessibility_delegate_;
272 std::unique_ptr<BrightnessControlDelegate> brightness_control_delegate_; 277 std::unique_ptr<BrightnessControlDelegate> brightness_control_delegate_;
273 std::unique_ptr<FocusCycler> focus_cycler_; 278 std::unique_ptr<FocusCycler> focus_cycler_;
274 std::unique_ptr<KeyboardBrightnessControlDelegate> 279 std::unique_ptr<KeyboardBrightnessControlDelegate>
275 keyboard_brightness_control_delegate_; 280 keyboard_brightness_control_delegate_;
276 std::unique_ptr<KeyboardUI> keyboard_ui_; 281 std::unique_ptr<KeyboardUI> keyboard_ui_;
277 std::unique_ptr<MaximizeModeController> maximize_mode_controller_; 282 std::unique_ptr<MaximizeModeController> maximize_mode_controller_;
278 std::unique_ptr<MediaDelegate> media_delegate_; 283 std::unique_ptr<MediaDelegate> media_delegate_;
279 std::unique_ptr<MruWindowTracker> mru_window_tracker_; 284 std::unique_ptr<MruWindowTracker> mru_window_tracker_;
280 std::unique_ptr<SystemTrayNotifier> system_tray_notifier_; 285 std::unique_ptr<SystemTrayNotifier> system_tray_notifier_;
281 std::unique_ptr<SystemTrayDelegate> system_tray_delegate_; 286 std::unique_ptr<SystemTrayDelegate> system_tray_delegate_;
287 std::unique_ptr<ToastManager> toast_manager_;
282 std::unique_ptr<WindowCycleController> window_cycle_controller_; 288 std::unique_ptr<WindowCycleController> window_cycle_controller_;
283 std::unique_ptr<WindowSelectorController> window_selector_controller_; 289 std::unique_ptr<WindowSelectorController> window_selector_controller_;
284 290
285 bool simulate_modal_window_open_for_testing_ = false; 291 bool simulate_modal_window_open_for_testing_ = false;
286 292
287 #if defined(OS_CHROMEOS) 293 #if defined(OS_CHROMEOS)
288 std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_; 294 std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_;
289 #endif 295 #endif
290 }; 296 };
291 297
292 } // namespace ash 298 } // namespace ash
293 299
294 #endif // ASH_COMMON_WM_SHELL_H_ 300 #endif // ASH_COMMON_WM_SHELL_H_
OLDNEW
« no previous file with comments | « ash/accelerators/debug_commands.cc ('k') | ash/common/wm_shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698