cros: Merge SystemTrayDelegate::GetUserLoginStatus

ash/system/palette/palette_tray.cc

Index: ash/system/palette/palette_tray.cc
diff --git a/ash/system/palette/palette_tray.cc b/ash/system/palette/palette_tray.cc
index ab54c99bc80cbd5079af5296f0ed191b8a1012a2..a1b1c6b5829d12e2ea2e0f052613ce7ad5898f2a 100644
--- a/ash/system/palette/palette_tray.cc
+++ b/ash/system/palette/palette_tray.cc
@@ -17,7 +17,6 @@
 #include "ash/system/palette/palette_utils.h"
 #include "ash/system/tray/system_menu_button.h"
 #include "ash/system/tray/system_tray_controller.h"
-#include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/tray_bubble_wrapper.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_container.h"
@@ -65,8 +64,7 @@ bool IsInUserSession() {
   return !session_controller->IsUserSessionBlocked() &&
          session_controller->GetSessionState() ==
              session_manager::SessionState::ACTIVE &&
-         Shell::Get()->system_tray_delegate()->GetUserLoginStatus() !=
-             LoginStatus::KIOSK_APP;
+         session_controller->login_status() != LoginStatus::KIOSK_APP;

[James Cook, 2017/05/05 20:23:23]

Aside: I wonder if it is intentional that ARC kiosk apps can show the stylus
tools.

[xiyuan, 2017/05/05 20:54:46]

I doubt that it is intentional since ARC kiosk is full screen and does not show
shelf. Changed to use IsKioskSession. And we will find out.

 }
 
 class TitleView : public views::View, public views::ButtonListener {