Index: ash/system/tray/default_system_tray_delegate.cc |
diff --git a/ash/system/tray/default_system_tray_delegate.cc b/ash/system/tray/default_system_tray_delegate.cc |
index fe6681f643f5c407e10d96149edb5045cac7087c..2658f52bd7d54084fa4381786c104456614da820 100644 |
--- a/ash/system/tray/default_system_tray_delegate.cc |
+++ b/ash/system/tray/default_system_tray_delegate.cc |
@@ -72,7 +72,9 @@ const base::string16 DefaultSystemTrayDelegate::GetEnterpriseMessage() const { |
const std::string |
DefaultSystemTrayDelegate::GetSupervisedUserManager() const { |
- return std::string(); |
+ if (!IsUserSupervised()) |
+ return std::string(); |
+ return "manager@chrome.com"; |
} |
const base::string16 |
@@ -87,7 +89,7 @@ const base::string16 DefaultSystemTrayDelegate::GetSupervisedUserMessage() |
} |
bool DefaultSystemTrayDelegate::IsUserSupervised() const { |
- return false; |
+ return GetUserLoginStatus() == ash::user::LOGGED_IN_SUPERVISED; |
} |
void DefaultSystemTrayDelegate::GetSystemUpdateInfo(UpdateInfo* info) const { |
@@ -291,4 +293,12 @@ tray::UserAccountsDelegate* DefaultSystemTrayDelegate::GetUserAccountsDelegate( |
return NULL; |
} |
+void DefaultSystemTrayDelegate::AddCustodianInfoTrayObserver( |
+ CustodianInfoTrayObserver* observer) { |
+} |
+ |
+void DefaultSystemTrayDelegate::RemoveCustodianInfoTrayObserver( |
+ CustodianInfoTrayObserver* observer) { |
+} |
+ |
} // namespace ash |