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

Unified Diff: ash/shell.cc

Issue 9562008: ash uber tray: Add entry for power and date. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 10 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 52e25d14a06f2d138b3b1f50d1f7c75d485599d5..bb4ba91ea7ae4811420ab5e665416ac6e80005df 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -18,6 +18,8 @@
#include "ash/system/audio/tray_volume.h"
#include "ash/system/brightness/tray_brightness.h"
#include "ash/system/settings/tray_settings.h"
+#include "ash/system/power/power_status_controller.h"
+#include "ash/system/power/tray_power_date.h"
#include "ash/system/tray/system_tray_delegate.h"
#include "ash/system/tray/system_tray.h"
#include "ash/system/tray_user.h"
@@ -422,10 +424,13 @@ void Shell::Init() {
internal::TrayVolume* tray_volume = new internal::TrayVolume();
internal::TrayBrightness* tray_brightness = new internal::TrayBrightness();
+ internal::TrayPowerDate* tray_power_date = new internal::TrayPowerDate();
audio_controller_ = tray_volume;
brightness_controller_ = tray_brightness;
+ power_status_controller_ = tray_power_date;
tray_->AddTrayItem(new internal::TrayUser());
+ tray_->AddTrayItem(tray_power_date);
tray_->AddTrayItem(tray_volume);
tray_->AddTrayItem(tray_brightness);
tray_->AddTrayItem(new internal::TraySettings());

Powered by Google App Engine
This is Rietveld 408576698