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

Unified Diff: ash/shell.h

Issue 2857103007: [Night Light] CL2: Ash and system tray work (Closed)
Patch Set: Rebase on Xiyuan's change, and mpearson's nit. 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 side-by-side diff with in-line comments
Download patch
Index: ash/shell.h
diff --git a/ash/shell.h b/ash/shell.h
index bdc3797552e5f19c7d4f622a469ea707bc008ff4..ed01d54572d873390b9dbe2616a0a36585dbf4bb 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;
@@ -261,6 +263,9 @@ class ASH_EXPORT Shell : public SessionObserver,
static Config GetAshConfig();
static bool ShouldUseIMEService();
+ // 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(
@@ -327,6 +332,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();
@@ -685,6 +693,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_;

Powered by Google App Engine
This is Rietveld 408576698