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

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

Issue 627593003: Adding infrastructure for possibility of changing manager names for the supervised accounts. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Default system tray extended for proper tests support. Created 6 years, 2 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/default_system_tray_delegate.h ('k') | ash/system/tray/system_tray_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « ash/system/tray/default_system_tray_delegate.h ('k') | ash/system/tray/system_tray_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698