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

Unified Diff: chrome/browser/chromeos/system/ash_system_tray_delegate.cc

Issue 14507003: Add tray warning for Locally managed users. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 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: chrome/browser/chromeos/system/ash_system_tray_delegate.cc
diff --git a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
index c02ae2efc245c842bb27de160007d93c9091ba20..665eb4ac5ad0d5bc11d9dad4cf9c0d2ab7b5415e 100644
--- a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
+++ b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
@@ -481,6 +481,20 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate,
UTF8ToUTF16(GetEnterpriseDomain()));
}
+ virtual const std::string GetLocallyManagedUserManager() const OVERRIDE {
+ if (ash::user::LOGGED_IN_LOCALLY_MANAGED != GetUserLoginStatus())
Daniel Erat 2013/04/29 13:32:57 nit: if (GetUserLoginStatus() != ash::user::...)
Denis Kuznetsov (DE-MUC) 2013/04/29 14:14:58 Done.
+ return std::string();
+ return UserManager::Get()->GetManagerForManagedUser(GetUserEmail());
+ }
+
+ virtual const string16 GetLocallyManagedUserMessage() const OVERRIDE {
+ if (ash::user::LOGGED_IN_LOCALLY_MANAGED != GetUserLoginStatus())
Daniel Erat 2013/04/29 13:32:57 nit: if (GetUserLoginStatus() != ash::user::...)
Denis Kuznetsov (DE-MUC) 2013/04/29 14:14:58 Done.
+ return string16();
+ return l10n_util::GetStringFUTF16(IDS_USER_IS_LOCALLY_MANAGED_BY_NOTICE,
+ UTF8ToUTF16(
+ GetLocallyManagedUserManager()));
+ }
+
virtual bool SystemShouldUpgrade() const OVERRIDE {
return UpgradeDetector::GetInstance()->notify_upgrade();
}
@@ -552,6 +566,10 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate,
chrome::ShowPolicy(GetAppropriateBrowser());
}
+ virtual void ShowLocallyManagedUserInfo() OVERRIDE {
+ // TODO(antrim): find out what should we show in this case.
+ }
+
virtual void ShowEnterpriseInfo() OVERRIDE {
ash::user::LoginStatus status = GetUserLoginStatus();
if (status == ash::user::LOGGED_IN_NONE ||
« ash/system/user/tray_user.cc ('K') | « chrome/browser/chromeos/login/user_manager_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698