ash/accelerators/accelerator_controller_unittest.cc - Issue 2111443002: mash: Migrate SessionStateDelegate access to WmShell.

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/accelerators/accelerator_controller_unittest.cc

Issue 2111443002: mash: Migrate SessionStateDelegate access to WmShell. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Address comments. Created 4 years, 6 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 | « no previous file | ash/desktop_background/desktop_background_view.cc » ('j') | chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/accelerators/accelerator_controller_unittest.cc

diff --git a/ash/accelerators/accelerator_controller_unittest.cc b/ash/accelerators/accelerator_controller_unittest.cc

index e982ddf29264ab34b5543a87daac6ac4815cb824..e9e518796db0529806450049593a8bea38130de8 100644

--- a/ash/accelerators/accelerator_controller_unittest.cc

+++ b/ash/accelerators/accelerator_controller_unittest.cc

@@ -1332,9 +1332,8 @@ class DeprecatedAcceleratorTester : public AcceleratorControllerTest {

}

void ResetStateIfNeeded() {

- Shell* shell = Shell::GetInstance();

- if (shell->session_state_delegate()->IsScreenLocked() ||

- shell->session_state_delegate()->IsUserSessionBlocked()) {

+ if (WmShell::Get()->GetSessionStateDelegate()->IsScreenLocked() ||

+ WmShell::Get()->GetSessionStateDelegate()->IsUserSessionBlocked()) {

UnblockUserSession();

}