| Index: ash/shell.h
|
| diff --git a/ash/shell.h b/ash/shell.h
|
| index 0a5fb1535017445c8b0bfde0789d97c1c1707e22..9ea93b7e4b2d3d0edc77921dbc3cddd452d0e45f 100644
|
| --- a/ash/shell.h
|
| +++ b/ash/shell.h
|
| @@ -25,6 +25,7 @@
|
| #include "ui/wm/core/cursor_manager.h"
|
| #include "ui/wm/public/activation_change_observer.h"
|
|
|
| +class PrefRegistrySimple;
|
| class PrefService;
|
|
|
| namespace aura {
|
| @@ -121,6 +122,7 @@ class MediaController;
|
| class MouseCursorEventFilter;
|
| class MruWindowTracker;
|
| class NewWindowController;
|
| +class NightLightController;
|
| class OverlayEventFilter;
|
| class PaletteDelegate;
|
| class PartialMagnificationController;
|
| @@ -259,6 +261,9 @@ class ASH_EXPORT Shell : public SessionObserver,
|
|
|
| static Config GetAshConfig();
|
|
|
| + // Registers all ash related prefs to the given |registry|.
|
| + static void RegisterPrefs(PrefRegistrySimple* registry);
|
| +
|
| // Creates a default views::NonClientFrameView for use by windows in the
|
| // Ash environment.
|
| views::NonClientFrameView* CreateDefaultNonClientFrameView(
|
| @@ -325,6 +330,9 @@ class ASH_EXPORT Shell : public SessionObserver,
|
| NewWindowController* new_window_controller() {
|
| return new_window_controller_.get();
|
| }
|
| + NightLightController* night_light_controller() {
|
| + return night_light_controller_.get();
|
| + }
|
| SessionController* session_controller() { return session_controller_.get(); }
|
| ShelfController* shelf_controller() { return shelf_controller_.get(); }
|
| ShelfModel* shelf_model();
|
| @@ -682,6 +690,7 @@ class ASH_EXPORT Shell : public SessionObserver,
|
| std::unique_ptr<PaletteDelegate> palette_delegate_;
|
| std::unique_ptr<ResizeShadowController> resize_shadow_controller_;
|
| std::unique_ptr<SessionController> session_controller_;
|
| + std::unique_ptr<NightLightController> night_light_controller_;
|
| std::unique_ptr<ShelfController> shelf_controller_;
|
| std::unique_ptr<ShelfWindowWatcher> shelf_window_watcher_;
|
| std::unique_ptr<ShellDelegate> shell_delegate_;
|
|
|