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

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

Issue 2549903002: mash: Reverse the responsibilities of the NewWindowClient. (Closed)
Patch Set: jamescook comments 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/test/wm_shell_test_api.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 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 class CastConfigController; 47 class CastConfigController;
48 class FocusCycler; 48 class FocusCycler;
49 class ImmersiveContextAsh; 49 class ImmersiveContextAsh;
50 class ImmersiveFullscreenController; 50 class ImmersiveFullscreenController;
51 class KeyEventWatcher; 51 class KeyEventWatcher;
52 class KeyboardBrightnessControlDelegate; 52 class KeyboardBrightnessControlDelegate;
53 class KeyboardUI; 53 class KeyboardUI;
54 class LocaleNotificationController; 54 class LocaleNotificationController;
55 class MaximizeModeController; 55 class MaximizeModeController;
56 class MruWindowTracker; 56 class MruWindowTracker;
57 class NewWindowController;
57 class PaletteDelegate; 58 class PaletteDelegate;
58 class ScopedDisableInternalMouseAndKeyboard; 59 class ScopedDisableInternalMouseAndKeyboard;
59 class SessionStateDelegate; 60 class SessionStateDelegate;
60 class ShelfController; 61 class ShelfController;
61 class ShelfDelegate; 62 class ShelfDelegate;
62 class ShelfModel; 63 class ShelfModel;
63 class ShelfWindowWatcher; 64 class ShelfWindowWatcher;
64 class ShellDelegate; 65 class ShellDelegate;
65 class ShellObserver; 66 class ShellObserver;
66 class ShutdownController; 67 class ShutdownController;
67 class SystemTrayDelegate; 68 class SystemTrayDelegate;
68 class SystemTrayController; 69 class SystemTrayController;
69 class SystemTrayNotifier; 70 class SystemTrayNotifier;
70 class ToastManager; 71 class ToastManager;
71 class WallpaperController; 72 class WallpaperController;
72 class WallpaperDelegate; 73 class WallpaperDelegate;
73 class WindowCycleController; 74 class WindowCycleController;
74 class WindowCycleEventFilter; 75 class WindowCycleEventFilter;
75 class WindowResizer; 76 class WindowResizer;
76 class WindowSelectorController; 77 class WindowSelectorController;
77 class WmActivationObserver; 78 class WmActivationObserver;
78 class WmDisplayObserver; 79 class WmDisplayObserver;
79 class WmRootWindowController; 80 class WmRootWindowController;
80 class WmWindow; 81 class WmWindow;
81 class WorkspaceEventHandler; 82 class WorkspaceEventHandler;
82 83
83 enum class LoginStatus; 84 enum class LoginStatus;
84 enum class TaskSwitchSource; 85 enum class TaskSwitchSource;
85 86
86 namespace mojom {
87 class NewWindowClient;
88 }
89
90 namespace wm { 87 namespace wm {
91 class MaximizeModeEventHandler; 88 class MaximizeModeEventHandler;
92 class WindowState; 89 class WindowState;
93 } 90 }
94 91
95 #if defined(OS_CHROMEOS) 92 #if defined(OS_CHROMEOS)
96 class LogoutConfirmationController; 93 class LogoutConfirmationController;
97 class VpnList; 94 class VpnList;
98 #endif 95 #endif
99 96
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 } 135 }
139 136
140 MaximizeModeController* maximize_mode_controller() { 137 MaximizeModeController* maximize_mode_controller() {
141 return maximize_mode_controller_.get(); 138 return maximize_mode_controller_.get();
142 } 139 }
143 140
144 MruWindowTracker* mru_window_tracker() { return mru_window_tracker_.get(); } 141 MruWindowTracker* mru_window_tracker() { return mru_window_tracker_.get(); }
145 142
146 MediaDelegate* media_delegate() { return media_delegate_.get(); } 143 MediaDelegate* media_delegate() { return media_delegate_.get(); }
147 144
148 mojom::NewWindowClient* new_window_client() { 145 NewWindowController* new_window_controller() {
149 return new_window_client_.get(); 146 return new_window_controller_.get();
150 } 147 }
151 148
152 // NOTE: Prefer ScopedRootWindowForNewWindows when setting temporarily. 149 // NOTE: Prefer ScopedRootWindowForNewWindows when setting temporarily.
153 void set_root_window_for_new_windows(WmWindow* root) { 150 void set_root_window_for_new_windows(WmWindow* root) {
154 root_window_for_new_windows_ = root; 151 root_window_for_new_windows_ = root;
155 } 152 }
156 153
157 PaletteDelegate* palette_delegate() { return palette_delegate_.get(); } 154 PaletteDelegate* palette_delegate() { return palette_delegate_.get(); }
158 155
159 ShelfController* shelf_controller() { return shelf_controller_.get(); } 156 ShelfController* shelf_controller() { return shelf_controller_.get(); }
(...skipping 325 matching lines...) Expand 10 before | Expand all | Expand 10 after
485 std::unique_ptr<CastConfigController> cast_config_; 482 std::unique_ptr<CastConfigController> cast_config_;
486 std::unique_ptr<FocusCycler> focus_cycler_; 483 std::unique_ptr<FocusCycler> focus_cycler_;
487 std::unique_ptr<ImmersiveContextAsh> immersive_context_; 484 std::unique_ptr<ImmersiveContextAsh> immersive_context_;
488 std::unique_ptr<KeyboardBrightnessControlDelegate> 485 std::unique_ptr<KeyboardBrightnessControlDelegate>
489 keyboard_brightness_control_delegate_; 486 keyboard_brightness_control_delegate_;
490 std::unique_ptr<KeyboardUI> keyboard_ui_; 487 std::unique_ptr<KeyboardUI> keyboard_ui_;
491 std::unique_ptr<LocaleNotificationController> locale_notification_controller_; 488 std::unique_ptr<LocaleNotificationController> locale_notification_controller_;
492 std::unique_ptr<MaximizeModeController> maximize_mode_controller_; 489 std::unique_ptr<MaximizeModeController> maximize_mode_controller_;
493 std::unique_ptr<MediaDelegate> media_delegate_; 490 std::unique_ptr<MediaDelegate> media_delegate_;
494 std::unique_ptr<MruWindowTracker> mru_window_tracker_; 491 std::unique_ptr<MruWindowTracker> mru_window_tracker_;
495 std::unique_ptr<mojom::NewWindowClient> new_window_client_; 492 std::unique_ptr<NewWindowController> new_window_controller_;
496 std::unique_ptr<PaletteDelegate> palette_delegate_; 493 std::unique_ptr<PaletteDelegate> palette_delegate_;
497 std::unique_ptr<ShelfController> shelf_controller_; 494 std::unique_ptr<ShelfController> shelf_controller_;
498 std::unique_ptr<ShelfDelegate> shelf_delegate_; 495 std::unique_ptr<ShelfDelegate> shelf_delegate_;
499 std::unique_ptr<ShelfWindowWatcher> shelf_window_watcher_; 496 std::unique_ptr<ShelfWindowWatcher> shelf_window_watcher_;
500 std::unique_ptr<ShutdownController> shutdown_controller_; 497 std::unique_ptr<ShutdownController> shutdown_controller_;
501 std::unique_ptr<SystemTrayController> system_tray_controller_; 498 std::unique_ptr<SystemTrayController> system_tray_controller_;
502 std::unique_ptr<SystemTrayNotifier> system_tray_notifier_; 499 std::unique_ptr<SystemTrayNotifier> system_tray_notifier_;
503 std::unique_ptr<SystemTrayDelegate> system_tray_delegate_; 500 std::unique_ptr<SystemTrayDelegate> system_tray_delegate_;
504 std::unique_ptr<ToastManager> toast_manager_; 501 std::unique_ptr<ToastManager> toast_manager_;
505 std::unique_ptr<WallpaperController> wallpaper_controller_; 502 std::unique_ptr<WallpaperController> wallpaper_controller_;
(...skipping 14 matching lines...) Expand all
520 517
521 #if defined(OS_CHROMEOS) 518 #if defined(OS_CHROMEOS)
522 std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_; 519 std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_;
523 std::unique_ptr<VpnList> vpn_list_; 520 std::unique_ptr<VpnList> vpn_list_;
524 #endif 521 #endif
525 }; 522 };
526 523
527 } // namespace ash 524 } // namespace ash
528 525
529 #endif // ASH_COMMON_WM_SHELL_H_ 526 #endif // ASH_COMMON_WM_SHELL_H_
OLDNEW
« no previous file with comments | « ash/common/test/wm_shell_test_api.cc ('k') | ash/common/wm_shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698