cros: Move IsUserSupervised and IsUserChild off SystemTrayDelegate

ash/system/supervised/tray_supervised_user.cc

 // Copyright 2014 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/supervised/tray_supervised_user.h"
 
 #include <utility>
 
 #include "ash/login_status.h"
 #include "ash/resources/vector_icons/vector_icons.h"
+#include "ash/session/session_controller.h"
 #include "ash/shell.h"
 #include "ash/system/system_notifier.h"
 #include "ash/system/tray/label_tray_view.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/tray_constants.h"
 #include "base/callback.h"
 #include "base/logging.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/message_center/message_center.h"
 #include "ui/message_center/notification.h"
@@ skipping 27 matching lines @@
       Shell::Get()->system_tray_delegate()->GetSupervisedUserMessage();
   if (tray_view_)
     tray_view_->SetMessage(message);
   if (message_center::MessageCenter::Get()->FindVisibleNotificationById(
           kNotificationId))
     CreateOrUpdateNotification(message);
 }
 
 views::View* TraySupervisedUser::CreateDefaultView(LoginStatus status) {
   DCHECK(!tray_view_);
-  SystemTrayDelegate* delegate = Shell::Get()->system_tray_delegate();
-  if (!delegate->IsUserSupervised())
+  if (!Shell::Get()->session_controller()->IsUserSupervised())
     return nullptr;
 
   tray_view_ = new LabelTrayView(this, GetSupervisedUserIcon());
   UpdateMessage();
   return tray_view_;
 }
 
 void TraySupervisedUser::DestroyDefaultView() {
   tray_view_ = nullptr;
 }
 
 void TraySupervisedUser::OnViewClicked(views::View* sender) {
   // TODO(antrim): Find out what should we show in this case.
 }
 
 void TraySupervisedUser::UpdateAfterLoginStatusChange(LoginStatus status) {
   SystemTrayDelegate* delegate = Shell::Get()->system_tray_delegate();
+  SessionController* session = Shell::Get()->session_controller();
 
-  bool is_user_supervised = delegate->IsUserSupervised();
+  const bool is_user_supervised = session->IsUserSupervised();
   if (status == status_ && is_user_supervised == is_user_supervised_)
     return;
 
-  if (is_user_supervised && !delegate->IsUserChild() &&
+  if (is_user_supervised && !session->IsUserChild() &&
       status_ != LoginStatus::LOCKED &&
       !delegate->GetSupervisedUserManager().empty()) {
     CreateOrUpdateSupervisedWarningNotification();
   }
 
   status_ = status;
   is_user_supervised_ = is_user_supervised;
 }
 
 void TraySupervisedUser::CreateOrUpdateNotification(
@@ skipping 11 matching lines @@
 
 void TraySupervisedUser::CreateOrUpdateSupervisedWarningNotification() {
   SystemTrayDelegate* delegate = Shell::Get()->system_tray_delegate();
   CreateOrUpdateNotification(delegate->GetSupervisedUserMessage());
 }
 
 void TraySupervisedUser::OnCustodianInfoChanged() {
   SystemTrayDelegate* delegate = Shell::Get()->system_tray_delegate();
   std::string manager_name = delegate->GetSupervisedUserManager();
   if (!manager_name.empty()) {
-    if (!delegate->IsUserChild() &&
+    if (!Shell::Get()->session_controller()->IsUserChild() &&
         !message_center::MessageCenter::Get()->FindVisibleNotificationById(
             kNotificationId)) {
       CreateOrUpdateSupervisedWarningNotification();
     }
     UpdateMessage();
   }
 }
 
 const gfx::VectorIcon& TraySupervisedUser::GetSupervisedUserIcon() const {
-  SystemTrayDelegate* delegate = Shell::Get()->system_tray_delegate();
+  // Not intended to be used for non-supervised users.
+  DCHECK(Shell::Get()->session_controller()->IsUserSupervised());
 
-  // Not intended to be used for non-supervised users.
-  DCHECK(delegate->IsUserSupervised());
-
-  if (delegate->IsUserChild())
+  if (Shell::Get()->session_controller()->IsUserChild())
     return kSystemMenuChildUserIcon;
   return kSystemMenuSupervisedUserIcon;
 }
 
 }  // namespace ash