Revert of ash: Add checks for supervised users.

ash/system/user/tray_user.cc

 // Copyright (c) 2012 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 "ash/system/user/tray_user.h"
 
 #include "ash/ash_switches.h"
 #include "ash/root_window_controller.h"
 #include "ash/session/session_state_delegate.h"
 #include "ash/shelf/shelf_layout_manager.h"
@@ skipping 119 matching lines @@
 }
 
 void TrayUser::UpdateAfterLoginStatusChange(user::LoginStatus status) {
   // Only the active user is represented in the tray.
   if (!layout_view_)
     return;
   if (GetTrayIndex() > 0)
     return;
   bool need_label = false;
   bool need_avatar = false;
-  SystemTrayDelegate* delegate = Shell::GetInstance()->system_tray_delegate();
-  if (delegate->IsUserSupervised())
-    need_label =  true;
   switch (status) {
     case user::LOGGED_IN_LOCKED:
     case user::LOGGED_IN_USER:
     case user::LOGGED_IN_OWNER:
     case user::LOGGED_IN_PUBLIC:
       need_avatar = true;
       break;
     case user::LOGGED_IN_SUPERVISED:
       need_avatar = true;
       need_label = true;
@@ skipping 18 matching lines @@
       label_ = NULL;
     }
     if (need_avatar) {
       avatar_ = new tray::RoundedImageView(kTrayAvatarCornerRadius, true);
       layout_view_->AddChildView(avatar_);
     } else {
       avatar_ = NULL;
     }
   }
 
-  if (delegate->IsUserSupervised()) {
+  if (status == user::LOGGED_IN_SUPERVISED) {
     label_->SetText(
         l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_SUPERVISED_LABEL));
   } else if (status == user::LOGGED_IN_GUEST) {
     label_->SetText(l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_GUEST_LABEL));
   }
 
   if (avatar_) {
     avatar_->SetCornerRadii(
         0, kTrayAvatarCornerRadius, kTrayAvatarCornerRadius, 0);
     avatar_->SetBorder(views::Border::NullBorder());
@@ skipping 101 matching lines @@
 void TrayUser::UpdateLayoutOfItem() {
   RootWindowController* controller = GetRootWindowController(
       system_tray()->GetWidget()->GetNativeWindow()->GetRootWindow());
   if (controller && controller->shelf()) {
     UpdateAfterShelfAlignmentChange(
         controller->GetShelfLayoutManager()->GetAlignment());
   }
 }
 
 }  // namespace ash