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

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

Issue 1149833006: Stop the OverviewButton from appearing on the Add-User screen (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 73b9c148146c1129afb2de9ddd2c4f98de5ff4cc..19e5005877563523d79cb50112c561692922424a 100644
--- a/ash/wm/overview/window_selector_controller.cc
+++ b/ash/wm/overview/window_selector_controller.cc
@@ -30,9 +30,12 @@ WindowSelectorController::~WindowSelectorController() {
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.
- return Shell::GetInstance()->session_state_delegate()->
- IsActiveUserSessionStarted() &&
+ return Shell::GetInstance()
+ ->session_state_delegate()
+ ->IsActiveUserSessionStarted() &&
!Shell::GetInstance()->session_state_delegate()->IsScreenLocked() &&
+ Shell::GetInstance()->session_state_delegate()->GetSessionState() ==
+ SessionStateDelegate::SESSION_STATE_ACTIVE &&
!Shell::GetInstance()->IsSystemModalWindowOpen() &&
Shell::GetInstance()->system_tray_delegate()->GetUserLoginStatus() !=
user::LOGGED_IN_KIOSK_APP;

Powered by Google App Engine
This is Rietveld 408576698