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

Unified Diff: ash/shell.cc

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 side-by-side diff with in-line comments
Download patch
Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index 665d81a94bd4bcc83096667eb8e6ad26e94d49ac..fcf600f5746fd62771da225d9c5a7c38b094570b 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -73,6 +73,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"
@@ -552,6 +553,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>()),

Powered by Google App Engine
This is Rietveld 408576698