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

Unified Diff: ash/shell.cc

Issue 2857103007: [Night Light] CL2: Ash and system tray work (Closed)
Patch Set: Update comment 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
« no previous file with comments | « ash/shell.h ('k') | ash/system/night_light/night_light_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index 3988f49c87aea72fb779ef91c01eeca9de0e5def..525229c8e6cc076d334e02aebc2ca5f31855576e 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -74,6 +74,7 @@
#include "ash/system/locale/locale_notification_controller.h"
#include "ash/system/network/sms_observer.h"
#include "ash/system/network/vpn_list.h"
+#include "ash/system/night_light/night_light_controller.h"
#include "ash/system/power/power_event_observer.h"
#include "ash/system/power/power_status.h"
#include "ash/system/power/video_activity_notifier.h"
@@ -319,6 +320,11 @@ bool Shell::ShouldUseIMEService() {
switches::kUseIMEService));
}
+// static
+void Shell::RegisterPrefs(PrefRegistrySimple* registry) {
+ NightLightController::RegisterPrefs(registry);
+}
+
views::NonClientFrameView* Shell::CreateDefaultNonClientFrameView(
views::Widget* widget) {
// Use translucent-style window frames for dialogs.
@@ -562,6 +568,8 @@ Shell::Shell(std::unique_ptr<ShellDelegate> shell_delegate,
media_controller_(base::MakeUnique<MediaController>()),
new_window_controller_(base::MakeUnique<NewWindowController>()),
session_controller_(base::MakeUnique<SessionController>()),
+ night_light_controller_(
+ base::MakeUnique<NightLightController>(session_controller_.get())),
shelf_controller_(base::MakeUnique<ShelfController>()),
shell_delegate_(std::move(shell_delegate)),
shutdown_controller_(base::MakeUnique<ShutdownController>()),
« no previous file with comments | « ash/shell.h ('k') | ash/system/night_light/night_light_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698