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

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

Issue 2545723003: ash: Add SessionController/Client mojo interfaces (Closed)
Patch Set: rebase 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 #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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 PaletteDelegate; 57 class PaletteDelegate;
58 class ScopedDisableInternalMouseAndKeyboard; 58 class ScopedDisableInternalMouseAndKeyboard;
59 class SessionController;
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;
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 return new_window_client_.get(); 150 return new_window_client_.get();
150 } 151 }
151 152
152 // NOTE: Prefer ScopedRootWindowForNewWindows when setting temporarily. 153 // NOTE: Prefer ScopedRootWindowForNewWindows when setting temporarily.
153 void set_root_window_for_new_windows(WmWindow* root) { 154 void set_root_window_for_new_windows(WmWindow* root) {
154 root_window_for_new_windows_ = root; 155 root_window_for_new_windows_ = root;
155 } 156 }
156 157
157 PaletteDelegate* palette_delegate() { return palette_delegate_.get(); } 158 PaletteDelegate* palette_delegate() { return palette_delegate_.get(); }
158 159
160 SessionController* session_controller() { return session_controller_.get(); }
161
159 ShelfController* shelf_controller() { return shelf_controller_.get(); } 162 ShelfController* shelf_controller() { return shelf_controller_.get(); }
160 163
161 ShelfDelegate* shelf_delegate() { return shelf_delegate_.get(); } 164 ShelfDelegate* shelf_delegate() { return shelf_delegate_.get(); }
162 165
163 ShelfModel* shelf_model(); 166 ShelfModel* shelf_model();
164 167
165 ShutdownController* shutdown_controller() { 168 ShutdownController* shutdown_controller() {
166 return shutdown_controller_.get(); 169 return shutdown_controller_.get();
167 } 170 }
168 171
(...skipping 318 matching lines...) Expand 10 before | Expand all | Expand 10 after
487 std::unique_ptr<ImmersiveContextAsh> immersive_context_; 490 std::unique_ptr<ImmersiveContextAsh> immersive_context_;
488 std::unique_ptr<KeyboardBrightnessControlDelegate> 491 std::unique_ptr<KeyboardBrightnessControlDelegate>
489 keyboard_brightness_control_delegate_; 492 keyboard_brightness_control_delegate_;
490 std::unique_ptr<KeyboardUI> keyboard_ui_; 493 std::unique_ptr<KeyboardUI> keyboard_ui_;
491 std::unique_ptr<LocaleNotificationController> locale_notification_controller_; 494 std::unique_ptr<LocaleNotificationController> locale_notification_controller_;
492 std::unique_ptr<MaximizeModeController> maximize_mode_controller_; 495 std::unique_ptr<MaximizeModeController> maximize_mode_controller_;
493 std::unique_ptr<MediaDelegate> media_delegate_; 496 std::unique_ptr<MediaDelegate> media_delegate_;
494 std::unique_ptr<MruWindowTracker> mru_window_tracker_; 497 std::unique_ptr<MruWindowTracker> mru_window_tracker_;
495 std::unique_ptr<mojom::NewWindowClient> new_window_client_; 498 std::unique_ptr<mojom::NewWindowClient> new_window_client_;
496 std::unique_ptr<PaletteDelegate> palette_delegate_; 499 std::unique_ptr<PaletteDelegate> palette_delegate_;
500 std::unique_ptr<SessionController> session_controller_;
497 std::unique_ptr<ShelfController> shelf_controller_; 501 std::unique_ptr<ShelfController> shelf_controller_;
498 std::unique_ptr<ShelfDelegate> shelf_delegate_; 502 std::unique_ptr<ShelfDelegate> shelf_delegate_;
499 std::unique_ptr<ShelfWindowWatcher> shelf_window_watcher_; 503 std::unique_ptr<ShelfWindowWatcher> shelf_window_watcher_;
500 std::unique_ptr<ShutdownController> shutdown_controller_; 504 std::unique_ptr<ShutdownController> shutdown_controller_;
501 std::unique_ptr<SystemTrayController> system_tray_controller_; 505 std::unique_ptr<SystemTrayController> system_tray_controller_;
502 std::unique_ptr<SystemTrayNotifier> system_tray_notifier_; 506 std::unique_ptr<SystemTrayNotifier> system_tray_notifier_;
503 std::unique_ptr<SystemTrayDelegate> system_tray_delegate_; 507 std::unique_ptr<SystemTrayDelegate> system_tray_delegate_;
504 std::unique_ptr<ToastManager> toast_manager_; 508 std::unique_ptr<ToastManager> toast_manager_;
505 std::unique_ptr<WallpaperController> wallpaper_controller_; 509 std::unique_ptr<WallpaperController> wallpaper_controller_;
506 std::unique_ptr<WallpaperDelegate> wallpaper_delegate_; 510 std::unique_ptr<WallpaperDelegate> wallpaper_delegate_;
(...skipping 13 matching lines...) Expand all
520 524
521 #if defined(OS_CHROMEOS) 525 #if defined(OS_CHROMEOS)
522 std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_; 526 std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_;
523 std::unique_ptr<VpnList> vpn_list_; 527 std::unique_ptr<VpnList> vpn_list_;
524 #endif 528 #endif
525 }; 529 };
526 530
527 } // namespace ash 531 } // namespace ash
528 532
529 #endif // ASH_COMMON_WM_SHELL_H_ 533 #endif // ASH_COMMON_WM_SHELL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698