cros: Merge SystemTrayDelegate::GetUserLoginStatus

ash/system/overview/overview_button_tray.cc

Index: ash/system/overview/overview_button_tray.cc
diff --git a/ash/system/overview/overview_button_tray.cc b/ash/system/overview/overview_button_tray.cc
index 331f445cce85281223718ca4b30916897b308988..b61f55cc4c1138092ece8134fb641d17b2f3c338 100644
--- a/ash/system/overview/overview_button_tray.cc
+++ b/ash/system/overview/overview_button_tray.cc
@@ -10,7 +10,6 @@
 #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"
@@ -107,10 +106,8 @@ void OverviewButtonTray::UpdateIconVisibility() {
       !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