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

Unified Diff: ash/system/tray/system_tray.cc

Issue 262973004: Move session length timer into tray bubble. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 8 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 726bbf36981b9d98a55408510fc9a50d5a4b882f..37f2a7db6269a874762cbbcacccaaac6306c82cf 100644
--- a/ash/system/tray/system_tray.cc
+++ b/ash/system/tray/system_tray.cc
@@ -152,9 +152,6 @@ void SystemTray::InitializeTrayItems(SystemTrayDelegate* delegate) {
}
void SystemTray::CreateItems(SystemTrayDelegate* delegate) {
-#if defined(OS_CHROMEOS)
- AddTrayItem(new TraySessionLengthLimit(this));
-#endif
#if !defined(OS_WIN)
// Create user items for each possible user.
ash::Shell* shell = ash::Shell::GetInstance();
@@ -174,6 +171,7 @@ void SystemTray::CreateItems(SystemTrayDelegate* delegate) {
tray_date_ = new TrayDate(this);
#if defined(OS_CHROMEOS)
+ AddTrayItem(new TraySessionLengthLimit(this));
stevenjb 2014/05/02 19:40:02 I assume that placing the session length limit tra
Thiemo Nagel 2014/05/02 20:05:19 Yes, it is.
AddTrayItem(new TrayEnterprise(this));
AddTrayItem(new TrayLocallyManagedUser(this));
AddTrayItem(new TrayIME(this));

Powered by Google App Engine
This is Rietveld 408576698