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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: trunk/src/ash/wm/workspace/workspace_cycler.cc

Issue 14200038: Revert 194589 "Revert 194578 "Add ash SessionStateDelegate"" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 8 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 | « trunk/src/ash/wm/window_cycle_controller_unittest.cc ('k') | trunk/src/ash/wm/workspace/workspace_layout_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/ash/wm/workspace/workspace_cycler.cc
===================================================================
--- trunk/src/ash/wm/workspace/workspace_cycler.cc (revision 194599)
+++ trunk/src/ash/wm/workspace/workspace_cycler.cc (working copy)
@@ -6,6 +6,7 @@
#include <cmath>
+#include "ash/session_state_delegate.h"
#include "ash/shell.h"
#include "ash/wm/workspace/workspace_cycler_configuration.h"
#include "ash/wm/workspace/workspace_manager.h"
@@ -22,7 +23,7 @@
// Returns true if cycling is allowed.
bool IsCyclingAllowed() {
// Cycling is disabled if the screen is locked or a modal dialog is open.
- return !Shell::GetInstance()->IsScreenLocked() &&
+ return !Shell::GetInstance()->session_state_delegate()->IsScreenLocked() &&
!Shell::GetInstance()->IsSystemModalWindowOpen();
}
Property changes on: trunk/src/ash/wm/workspace/workspace_cycler.cc
___________________________________________________________________
Added: svn:mergeinfo
« no previous file with comments | « trunk/src/ash/wm/window_cycle_controller_unittest.cc ('k') | trunk/src/ash/wm/workspace/workspace_layout_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698