cros: Merge SystemTrayDelegate::GetUserLoginStatus

ash/system/overview/overview_button_tray.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/overview/overview_button_tray.h"
 
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "ash/session/session_controller.h"
 #include "ash/shelf/shelf_constants.h"
 #include "ash/shell.h"
 #include "ash/shell_port.h"
 #include "ash/strings/grit/ash_strings.h"
-#include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_container.h"
 #include "ash/wm/maximize_mode/maximize_mode_controller.h"
 #include "ash/wm/overview/window_selector_controller.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/image_view.h"
 
 namespace ash {
@@ skipping 76 matching lines @@
   // a modal dialog is present.
   SessionController* session_controller = Shell::Get()->session_controller();
 
   Shell* shell = Shell::Get();
   SetVisible(
       shell->maximize_mode_controller()->IsMaximizeModeWindowManagerEnabled() &&
       session_controller->IsActiveUserSessionStarted() &&
       !session_controller->IsScreenLocked() &&
       session_controller->GetSessionState() ==
           session_manager::SessionState::ACTIVE &&
-      shell->system_tray_delegate()->GetUserLoginStatus() !=
-          LoginStatus::KIOSK_APP &&
-      shell->system_tray_delegate()->GetUserLoginStatus() !=
-          LoginStatus::ARC_KIOSK_APP);
+      session_controller->login_status() != LoginStatus::KIOSK_APP &&

[James Cook, 2017/05/05 17:51:53]

optional: WDYT of adding either SessionController::IsKiosk() or
SessionController::GetActiveUserType()?

not necessarily for this CL

[xiyuan, 2017/05/05 18:36:33]

Added a SessionController::IsKioskSession() and updated call sites like this to
use the call.

+      session_controller->login_status() != LoginStatus::ARC_KIOSK_APP);
 }
 
 }  // namespace ash