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

Unified Diff: ash/system/tray/system_tray.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/system/tray/system_tray.cc
diff --git a/ash/system/tray/system_tray.cc b/ash/system/tray/system_tray.cc
index cc76d1068097efec0d4d5068776e8af061cd296a..08221599993a0847b2b358a3ef0cc7f193601ead 100644
--- a/ash/system/tray/system_tray.cc
+++ b/ash/system/tray/system_tray.cc
@@ -27,6 +27,7 @@
#include "ash/system/media_security/multi_profile_media_tray_item.h"
#include "ash/system/network/tray_network.h"
#include "ash/system/network/tray_vpn.h"
+#include "ash/system/night_light/tray_night_light.h"
#include "ash/system/power/power_status.h"
#include "ash/system/power/tray_power.h"
#include "ash/system/screen_security/screen_capture_tray_item.h"
@@ -273,6 +274,7 @@ void SystemTray::CreateItems(SystemTrayDelegate* delegate) {
AddTrayItem(base::WrapUnique(tray_audio_));
AddTrayItem(base::MakeUnique<TrayBrightness>(this));
AddTrayItem(base::MakeUnique<TrayCapsLock>(this));
+ AddTrayItem(base::MakeUnique<TrayNightLight>(this));
// TODO(jamescook): Remove this when mus has support for display management
// and we have a DisplayManager equivalent. See http://crbug.com/548429
std::unique_ptr<SystemTrayItem> tray_rotation_lock =

Powered by Google App Engine
This is Rietveld 408576698