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/common/wm/overview/window_selector_controller.cc

Issue 2498613003: Add ARC++ kiosk menu items and ability to start kiosk session. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 1 month 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
« no previous file with comments | « ash/common/system/tray/system_tray.cc ('k') | chrome/browser/app_mode/app_mode_utils.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/wm/overview/window_selector_controller.cc
diff --git a/ash/common/wm/overview/window_selector_controller.cc b/ash/common/wm/overview/window_selector_controller.cc
index 76ef5d0bfbb4a9fdd68b3e51c49cb84cee28d5ce..f0a80d263baaa823cbd355e94fa8ac590f694f19 100644
--- a/ash/common/wm/overview/window_selector_controller.cc
+++ b/ash/common/wm/overview/window_selector_controller.cc
@@ -32,14 +32,16 @@ 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.
+ WmShell* wm_shell = WmShell::Get();
SessionStateDelegate* session_state_delegate =
- WmShell::Get()->GetSessionStateDelegate();
+ wm_shell->GetSessionStateDelegate();
+ SystemTrayDelegate* system_tray_delegate = wm_shell->system_tray_delegate();
return session_state_delegate->IsActiveUserSessionStarted() &&
!session_state_delegate->IsScreenLocked() &&
- !WmShell::Get()->IsSystemModalWindowOpen() &&
- !WmShell::Get()->IsPinned() &&
- WmShell::Get()->system_tray_delegate()->GetUserLoginStatus() !=
- LoginStatus::KIOSK_APP;
+ !wm_shell->IsSystemModalWindowOpen() && !wm_shell->IsPinned() &&
+ system_tray_delegate->GetUserLoginStatus() != LoginStatus::KIOSK_APP &&
+ system_tray_delegate->GetUserLoginStatus() !=
+ LoginStatus::ARC_KIOSK_APP;
}
bool WindowSelectorController::ToggleOverview() {
« no previous file with comments | « ash/common/system/tray/system_tray.cc ('k') | chrome/browser/app_mode/app_mode_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698