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

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

Issue 2545723003: ash: Add SessionController/Client mojo interfaces (Closed)
Patch Set: rebase, use ash_util::GetAshServiceName 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/session/session_state_delegate.h ('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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 NewWindowController;
58 class PaletteDelegate; 58 class PaletteDelegate;
59 class ScopedDisableInternalMouseAndKeyboard; 59 class ScopedDisableInternalMouseAndKeyboard;
60 class SessionController;
60 class SessionStateDelegate; 61 class SessionStateDelegate;
61 class ShelfController; 62 class ShelfController;
62 class ShelfDelegate; 63 class ShelfDelegate;
63 class ShelfModel; 64 class ShelfModel;
64 class ShelfWindowWatcher; 65 class ShelfWindowWatcher;
65 class ShellDelegate; 66 class ShellDelegate;
66 class ShellObserver; 67 class ShellObserver;
67 class ShutdownController; 68 class ShutdownController;
68 class SystemTrayDelegate; 69 class SystemTrayDelegate;
69 class SystemTrayController; 70 class SystemTrayController;
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 return new_window_controller_.get(); 147 return new_window_controller_.get();
147 } 148 }
148 149
149 // NOTE: Prefer ScopedRootWindowForNewWindows when setting temporarily. 150 // NOTE: Prefer ScopedRootWindowForNewWindows when setting temporarily.
150 void set_root_window_for_new_windows(WmWindow* root) { 151 void set_root_window_for_new_windows(WmWindow* root) {
151 root_window_for_new_windows_ = root; 152 root_window_for_new_windows_ = root;
152 } 153 }
153 154
154 PaletteDelegate* palette_delegate() { return palette_delegate_.get(); } 155 PaletteDelegate* palette_delegate() { return palette_delegate_.get(); }
155 156
157 SessionController* session_controller() { return session_controller_.get(); }
158
156 ShelfController* shelf_controller() { return shelf_controller_.get(); } 159 ShelfController* shelf_controller() { return shelf_controller_.get(); }
157 160
158 ShelfDelegate* shelf_delegate() { return shelf_delegate_.get(); } 161 ShelfDelegate* shelf_delegate() { return shelf_delegate_.get(); }
159 162
160 ShelfModel* shelf_model(); 163 ShelfModel* shelf_model();
161 164
162 ShutdownController* shutdown_controller() { 165 ShutdownController* shutdown_controller() {
163 return shutdown_controller_.get(); 166 return shutdown_controller_.get();
164 } 167 }
165 168
(...skipping 318 matching lines...) Expand 10 before | Expand all | Expand 10 after
484 std::unique_ptr<ImmersiveContextAsh> immersive_context_; 487 std::unique_ptr<ImmersiveContextAsh> immersive_context_;
485 std::unique_ptr<KeyboardBrightnessControlDelegate> 488 std::unique_ptr<KeyboardBrightnessControlDelegate>
486 keyboard_brightness_control_delegate_; 489 keyboard_brightness_control_delegate_;
487 std::unique_ptr<KeyboardUI> keyboard_ui_; 490 std::unique_ptr<KeyboardUI> keyboard_ui_;
488 std::unique_ptr<LocaleNotificationController> locale_notification_controller_; 491 std::unique_ptr<LocaleNotificationController> locale_notification_controller_;
489 std::unique_ptr<MaximizeModeController> maximize_mode_controller_; 492 std::unique_ptr<MaximizeModeController> maximize_mode_controller_;
490 std::unique_ptr<MediaDelegate> media_delegate_; 493 std::unique_ptr<MediaDelegate> media_delegate_;
491 std::unique_ptr<MruWindowTracker> mru_window_tracker_; 494 std::unique_ptr<MruWindowTracker> mru_window_tracker_;
492 std::unique_ptr<NewWindowController> new_window_controller_; 495 std::unique_ptr<NewWindowController> new_window_controller_;
493 std::unique_ptr<PaletteDelegate> palette_delegate_; 496 std::unique_ptr<PaletteDelegate> palette_delegate_;
497 std::unique_ptr<SessionController> session_controller_;
494 std::unique_ptr<ShelfController> shelf_controller_; 498 std::unique_ptr<ShelfController> shelf_controller_;
495 std::unique_ptr<ShelfDelegate> shelf_delegate_; 499 std::unique_ptr<ShelfDelegate> shelf_delegate_;
496 std::unique_ptr<ShelfWindowWatcher> shelf_window_watcher_; 500 std::unique_ptr<ShelfWindowWatcher> shelf_window_watcher_;
497 std::unique_ptr<ShutdownController> shutdown_controller_; 501 std::unique_ptr<ShutdownController> shutdown_controller_;
498 std::unique_ptr<SystemTrayController> system_tray_controller_; 502 std::unique_ptr<SystemTrayController> system_tray_controller_;
499 std::unique_ptr<SystemTrayNotifier> system_tray_notifier_; 503 std::unique_ptr<SystemTrayNotifier> system_tray_notifier_;
500 std::unique_ptr<SystemTrayDelegate> system_tray_delegate_; 504 std::unique_ptr<SystemTrayDelegate> system_tray_delegate_;
501 std::unique_ptr<ToastManager> toast_manager_; 505 std::unique_ptr<ToastManager> toast_manager_;
502 std::unique_ptr<WallpaperController> wallpaper_controller_; 506 std::unique_ptr<WallpaperController> wallpaper_controller_;
503 std::unique_ptr<WallpaperDelegate> wallpaper_delegate_; 507 std::unique_ptr<WallpaperDelegate> wallpaper_delegate_;
(...skipping 13 matching lines...) Expand all
517 521
518 #if defined(OS_CHROMEOS) 522 #if defined(OS_CHROMEOS)
519 std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_; 523 std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_;
520 std::unique_ptr<VpnList> vpn_list_; 524 std::unique_ptr<VpnList> vpn_list_;
521 #endif 525 #endif
522 }; 526 };
523 527
524 } // namespace ash 528 } // namespace ash
525 529
526 #endif // ASH_COMMON_WM_SHELL_H_ 530 #endif // ASH_COMMON_WM_SHELL_H_
OLDNEW
« no previous file with comments | « ash/common/session/session_state_delegate.h ('k') | ash/common/wm_shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698