ash/wm/lock_state_controller_unittest.cc - Issue 2118593002: mash: Migrate ShellDelegate ownership and 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/wm/lock_state_controller_unittest.cc

Issue 2118593002: mash: Migrate ShellDelegate ownership and access to WmShell. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Address comments. Created 4 years, 5 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

Index: ash/wm/lock_state_controller_unittest.cc

diff --git a/ash/wm/lock_state_controller_unittest.cc b/ash/wm/lock_state_controller_unittest.cc

index 812a5edb31402fc1e324f0c992f990162f358468..48d5535e683fb1dcfad7703d0027cb7d4743eb1b 100644

--- a/ash/wm/lock_state_controller_unittest.cc

+++ b/ash/wm/lock_state_controller_unittest.cc

@@ -70,7 +70,7 @@ class LockStateControllerTest : public AshTestBase {

power_button_controller_ = Shell::GetInstance()->power_button_controller();

shell_delegate_ =

- static_cast<TestShellDelegate*>(Shell::GetInstance()->delegate());

+ static_cast<TestShellDelegate*>(WmShell::Get()->delegate());

}

protected:

« no previous file with comments | « ash/wm/lock_state_controller.cc ('k') | ash/wm/window_positioner_unittest.cc » ('j') | no next file with comments »