ash: Add checks for supervised users.

chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h"
 
 #include <algorithm>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 376 matching lines @@
   if (GetUserLoginStatus() != ash::user::LOGGED_IN_SUPERVISED)
     return base::string16();
   return ChromeUserManager::Get()
       ->GetSupervisedUserManager()
       ->GetManagerDisplayName(
           user_manager::UserManager::Get()->GetActiveUser()->email());
 }
 
 const base::string16 SystemTrayDelegateChromeOS::GetSupervisedUserMessage()
     const {
-  if (GetUserLoginStatus() != ash::user::LOGGED_IN_SUPERVISED)
+  if (!IsUserSupervised())
     return base::string16();
   return l10n_util::GetStringFUTF16(
       IDS_USER_IS_SUPERVISED_BY_NOTICE,
       base::UTF8ToUTF16(GetSupervisedUserManager()));
 }
 
+bool SystemTrayDelegateChromeOS::IsUserSupervised() const {
+  user_manager::User* user = user_manager::UserManager::Get()->GetActiveUser();
+  return user && user->IsSupervised();
+}
+
 bool SystemTrayDelegateChromeOS::SystemShouldUpgrade() const {
   return UpgradeDetector::GetInstance()->notify_upgrade();
 }
 
 base::HourClockType SystemTrayDelegateChromeOS::GetHourClockType() const {
   return clock_type_;
 }
 
 void SystemTrayDelegateChromeOS::ShowSettings() {
   ShowSettingsSubPageForActiveUser("");
@@ skipping 878 matching lines @@
     accessibility_subscription_.reset();
   else
     OnAccessibilityModeChanged(details.notify);
 }
 
 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
   return new SystemTrayDelegateChromeOS();
 }
 
 }  // namespace chromeos