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

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

Issue 1114383002: Show overview mode button in TouchView with open modal window (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: use SetBoundsInScreen() 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
« no previous file with comments | « ash/wm/overview/window_selector_controller.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..4e622177034e20ac6a0722aa66a3ac8d3526d0a1 100644
--- a/ash/wm/overview/window_selector_controller.cc
+++ b/ash/wm/overview/window_selector_controller.cc
@@ -27,17 +27,20 @@ WindowSelectorController::~WindowSelectorController() {
}
// 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.
+bool WindowSelectorController::IsUserInActiveDesktopEnvironment() {
return Shell::GetInstance()->session_state_delegate()->
IsActiveUserSessionStarted() &&
!Shell::GetInstance()->session_state_delegate()->IsScreenLocked() &&
- !Shell::GetInstance()->IsSystemModalWindowOpen() &&
Shell::GetInstance()->system_tray_delegate()->GetUserLoginStatus() !=
user::LOGGED_IN_KIOSK_APP;
}
+// static
+bool WindowSelectorController::CanSelect() {
+ return IsUserInActiveDesktopEnvironment() &&
+ !Shell::GetInstance()->IsSystemModalWindowOpen();
+}
+
void WindowSelectorController::ToggleOverview() {
if (IsSelecting()) {
OnSelectionEnded();
« no previous file with comments | « ash/wm/overview/window_selector_controller.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698