ash/wm/power_button_controller.cc - Issue 2113053003: Moves Shell::maximize_mode_controller() 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/power_button_controller.cc

Issue 2113053003: Moves Shell::maximize_mode_controller() to WmShell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: order 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:

Index: ash/wm/power_button_controller.cc

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

index 30bf947b22873f99968bc680b1f3a350a4793199..fc83dbf3ccbae0095c25ef9b84cf1ae7172852d4 100644

--- a/ash/wm/power_button_controller.cc

+++ b/ash/wm/power_button_controller.cc

@@ -68,7 +68,7 @@ void PowerButtonController::OnPowerButtonEvent(

return;

if (volume_down_pressed_ && down &&

- Shell::GetInstance()

+ WmShell::Get()

->maximize_mode_controller()

->IsMaximizeModeWindowManagerEnabled()) {

Shell::GetInstance()->accelerator_controller()->PerformActionIfEnabled(

@@ -99,7 +99,7 @@ void PowerButtonController::OnPowerButtonEvent(

if (session_state_delegate->CanLockScreen() &&

!session_state_delegate->IsUserSessionBlocked()) {

- if (Shell::GetInstance()

+ if (WmShell::Get()

->maximize_mode_controller()

->IsMaximizeModeWindowManagerEnabled() &&

enable_quick_lock_)