cros: Merge SystemTrayDelegate::GetUserLoginStatus

ash/wm/overview/window_selector_controller.cc

 // Copyright 2013 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/wm/overview/window_selector_controller.h"
 
 #include <vector>
 
 #include "ash/session/session_controller.h"
 #include "ash/shell.h"
 #include "ash/shell_port.h"
-#include "ash/system/tray/system_tray_delegate.h"
 #include "ash/wm/mru_window_tracker.h"
 #include "ash/wm/overview/window_selector.h"
 #include "ash/wm/screen_pinning_controller.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm_window.h"
 #include "base/metrics/histogram_macros.h"
 
 namespace ash {
 
 WindowSelectorController::WindowSelectorController() {}
 
 WindowSelectorController::~WindowSelectorController() {
   // Destroy widgets that may be still animating if shell shuts down soon after
   // exiting overview mode.
   for (std::unique_ptr<DelayedAnimationObserver>& animation_observer :
        delayed_animations_) {
     animation_observer->Shutdown();
   }
 }
 
 // static
 bool WindowSelectorController::CanSelect() {
   // Don't allow a window overview if the screen is locked or a modal dialog is
   // open or running in kiosk app session.
   SessionController* session_controller = Shell::Get()->session_controller();
-  SystemTrayDelegate* system_tray_delegate =
-      Shell::Get()->system_tray_delegate();
   return session_controller->IsActiveUserSessionStarted() &&
          !session_controller->IsScreenLocked() &&
          !ShellPort::Get()->IsSystemModalWindowOpen() &&
          !Shell::Get()->screen_pinning_controller()->IsPinned() &&
-         system_tray_delegate->GetUserLoginStatus() != LoginStatus::KIOSK_APP &&
-         system_tray_delegate->GetUserLoginStatus() !=
-             LoginStatus::ARC_KIOSK_APP;
+         !session_controller->IsKioskSession();
 }
 
 bool WindowSelectorController::ToggleOverview() {
   if (IsSelecting()) {
     OnSelectionEnded();
   } else {
     // Don't start overview if window selection is not allowed.
     if (!CanSelect())
       return false;
 
@@ skipping 70 matching lines @@
 }
 
 void WindowSelectorController::OnSelectionStarted() {
   if (!last_selection_time_.is_null()) {
     UMA_HISTOGRAM_LONG_TIMES("Ash.WindowSelector.TimeBetweenUse",
                              base::Time::Now() - last_selection_time_);
   }
 }
 
 }  // namespace ash