Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(564)

Unified Diff: ash/wm/overview/window_selector_controller.cc

Issue 2864663002: cros: Merge SystemTrayDelegate::GetUserLoginStatus (Closed)
Patch Set: Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ash/wm/overview/window_selector_controller.cc
diff --git a/ash/wm/overview/window_selector_controller.cc b/ash/wm/overview/window_selector_controller.cc
index 86057fd240fd5dd67520acfe23b889f40228c0c4..24e520c3efae7b46969c392964aae70d9b3cfae2 100644
--- a/ash/wm/overview/window_selector_controller.cc
+++ b/ash/wm/overview/window_selector_controller.cc
@@ -9,7 +9,6 @@
#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"
@@ -35,15 +34,12 @@ 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->login_status() != LoginStatus::KIOSK_APP &&
+ session_controller->login_status() != LoginStatus::ARC_KIOSK_APP;
}
bool WindowSelectorController::ToggleOverview() {

Powered by Google App Engine
This is Rietveld 408576698