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

Unified Diff: ash/system/tray/system_tray.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/system/tray/system_tray.h ('k') | ash/system/tray/system_tray_item.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/tray/system_tray.cc
diff --git a/ash/system/tray/system_tray.cc b/ash/system/tray/system_tray.cc
index f16a8991a802413843b031c6116361e119c5fef4..80c2694fc232cf866e9318aecd16837166b44570 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,8 @@ void SystemTray::CreateItems(SystemTrayDelegate* delegate) {
AddTrayItem(base::WrapUnique(tray_audio_));
AddTrayItem(base::MakeUnique<TrayBrightness>(this));
AddTrayItem(base::MakeUnique<TrayCapsLock>(this));
+ tray_night_light_ = new TrayNightLight(this);
+ AddTrayItem(base::WrapUnique(tray_night_light_));
// 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 =
« no previous file with comments | « ash/system/tray/system_tray.h ('k') | ash/system/tray/system_tray_item.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698