ash/wm/workspace/workspace_cycler.cc - Issue 14295008: Add ash SessionStateDelegate

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 14295008: Add ash SessionStateDelegate (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebased. 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:

Index: ash/wm/workspace/workspace_cycler.cc

diff --git a/ash/wm/workspace/workspace_cycler.cc b/ash/wm/workspace/workspace_cycler.cc

index 67319937b6c089718e10cf2bf1488e173ba60d14..9d4cda1b50e6f945b3496fe8b69323534f60a6c1 100644

--- a/ash/wm/workspace/workspace_cycler.cc

+++ b/ash/wm/workspace/workspace_cycler.cc

@@ -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 @@ namespace {

// 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();

}