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

Side by Side Diff: ash/shell.h

Issue 2857103007: [Night Light] CL2: Ash and system tray work (Closed)
Patch Set: Exclude one test from mash Created 3 years, 7 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_SHELL_H_ 5 #ifndef ASH_SHELL_H_
6 #define ASH_SHELL_H_ 6 #define ASH_SHELL_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 class LinkHandlerModelFactory; 114 class LinkHandlerModelFactory;
115 class LocaleNotificationController; 115 class LocaleNotificationController;
116 class LockStateController; 116 class LockStateController;
117 class LogoutConfirmationController; 117 class LogoutConfirmationController;
118 class MagnificationController; 118 class MagnificationController;
119 class MaximizeModeController; 119 class MaximizeModeController;
120 class MediaController; 120 class MediaController;
121 class MouseCursorEventFilter; 121 class MouseCursorEventFilter;
122 class MruWindowTracker; 122 class MruWindowTracker;
123 class NewWindowController; 123 class NewWindowController;
124 class NightLightController;
124 class OverlayEventFilter; 125 class OverlayEventFilter;
125 class PaletteDelegate; 126 class PaletteDelegate;
126 class PartialMagnificationController; 127 class PartialMagnificationController;
127 class PowerButtonController; 128 class PowerButtonController;
128 class PowerEventObserver; 129 class PowerEventObserver;
129 class ProjectingObserver; 130 class ProjectingObserver;
130 class ResizeShadowController; 131 class ResizeShadowController;
131 class ResolutionNotificationController; 132 class ResolutionNotificationController;
132 class RootWindowController; 133 class RootWindowController;
133 class ShellPort; 134 class ShellPort;
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
319 } 320 }
320 MaximizeModeController* maximize_mode_controller() { 321 MaximizeModeController* maximize_mode_controller() {
321 return maximize_mode_controller_.get(); 322 return maximize_mode_controller_.get();
322 } 323 }
323 MediaController* media_controller() { return media_controller_.get(); } 324 MediaController* media_controller() { return media_controller_.get(); }
324 MruWindowTracker* mru_window_tracker() { return mru_window_tracker_.get(); } 325 MruWindowTracker* mru_window_tracker() { return mru_window_tracker_.get(); }
325 NewWindowController* new_window_controller() { 326 NewWindowController* new_window_controller() {
326 return new_window_controller_.get(); 327 return new_window_controller_.get();
327 } 328 }
328 SessionController* session_controller() { return session_controller_.get(); } 329 SessionController* session_controller() { return session_controller_.get(); }
330 NightLightController* night_light_controller() {
James Cook 2017/05/05 17:12:30 optional: alphabetize
afakhry 2017/05/05 20:04:10 Done.
331 return night_light_controller_.get();
332 }
329 ShelfController* shelf_controller() { return shelf_controller_.get(); } 333 ShelfController* shelf_controller() { return shelf_controller_.get(); }
330 ShelfModel* shelf_model(); 334 ShelfModel* shelf_model();
331 ShutdownController* shutdown_controller() { 335 ShutdownController* shutdown_controller() {
332 return shutdown_controller_.get(); 336 return shutdown_controller_.get();
333 } 337 }
334 SystemTrayController* system_tray_controller() { 338 SystemTrayController* system_tray_controller() {
335 return system_tray_controller_.get(); 339 return system_tray_controller_.get();
336 } 340 }
337 SystemTrayDelegate* system_tray_delegate() { 341 SystemTrayDelegate* system_tray_delegate() {
338 return system_tray_delegate_.get(); 342 return system_tray_delegate_.get();
(...skipping 336 matching lines...) Expand 10 before | Expand all | Expand 10 after
675 std::unique_ptr<KeyboardUI> keyboard_ui_; 679 std::unique_ptr<KeyboardUI> keyboard_ui_;
676 std::unique_ptr<LocaleNotificationController> locale_notification_controller_; 680 std::unique_ptr<LocaleNotificationController> locale_notification_controller_;
677 std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_; 681 std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_;
678 std::unique_ptr<MaximizeModeController> maximize_mode_controller_; 682 std::unique_ptr<MaximizeModeController> maximize_mode_controller_;
679 std::unique_ptr<MediaController> media_controller_; 683 std::unique_ptr<MediaController> media_controller_;
680 std::unique_ptr<MruWindowTracker> mru_window_tracker_; 684 std::unique_ptr<MruWindowTracker> mru_window_tracker_;
681 std::unique_ptr<NewWindowController> new_window_controller_; 685 std::unique_ptr<NewWindowController> new_window_controller_;
682 std::unique_ptr<PaletteDelegate> palette_delegate_; 686 std::unique_ptr<PaletteDelegate> palette_delegate_;
683 std::unique_ptr<ResizeShadowController> resize_shadow_controller_; 687 std::unique_ptr<ResizeShadowController> resize_shadow_controller_;
684 std::unique_ptr<SessionController> session_controller_; 688 std::unique_ptr<SessionController> session_controller_;
689 std::unique_ptr<NightLightController> night_light_controller_;
James Cook 2017/05/05 17:12:30 but you can't alphabetize here of course :-)
afakhry 2017/05/05 20:04:10 Yes, of course! :)
685 std::unique_ptr<ShelfController> shelf_controller_; 690 std::unique_ptr<ShelfController> shelf_controller_;
686 std::unique_ptr<ShelfWindowWatcher> shelf_window_watcher_; 691 std::unique_ptr<ShelfWindowWatcher> shelf_window_watcher_;
687 std::unique_ptr<ShellDelegate> shell_delegate_; 692 std::unique_ptr<ShellDelegate> shell_delegate_;
688 std::unique_ptr<ShutdownController> shutdown_controller_; 693 std::unique_ptr<ShutdownController> shutdown_controller_;
689 std::unique_ptr<SystemTrayController> system_tray_controller_; 694 std::unique_ptr<SystemTrayController> system_tray_controller_;
690 std::unique_ptr<SystemTrayDelegate> system_tray_delegate_; 695 std::unique_ptr<SystemTrayDelegate> system_tray_delegate_;
691 std::unique_ptr<SystemTrayNotifier> system_tray_notifier_; 696 std::unique_ptr<SystemTrayNotifier> system_tray_notifier_;
692 std::unique_ptr<ToastManager> toast_manager_; 697 std::unique_ptr<ToastManager> toast_manager_;
693 std::unique_ptr<VpnList> vpn_list_; 698 std::unique_ptr<VpnList> vpn_list_;
694 std::unique_ptr<WallpaperController> wallpaper_controller_; 699 std::unique_ptr<WallpaperController> wallpaper_controller_;
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
809 base::ObserverList<ShellObserver> shell_observers_; 814 base::ObserverList<ShellObserver> shell_observers_;
810 815
811 scoped_refptr<base::SequencedWorkerPool> blocking_pool_; 816 scoped_refptr<base::SequencedWorkerPool> blocking_pool_;
812 817
813 DISALLOW_COPY_AND_ASSIGN(Shell); 818 DISALLOW_COPY_AND_ASSIGN(Shell);
814 }; 819 };
815 820
816 } // namespace ash 821 } // namespace ash
817 822
818 #endif // ASH_SHELL_H_ 823 #endif // ASH_SHELL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698