ash/wm/power_button_controller.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/wm/power_button_controller.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 | « ash/wm/lock_state_controller_unittest.cc ('k') | ash/wm/system_modal_container_layout_manager.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/wm/power_button_controller.cc

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

index 227f52d33ec35d7381bb3fd92e79097a6dca2fbc..69828652d9b1415f93857b7403ca41b04c94feb2 100644

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

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

@@ -7,6 +7,7 @@

#include "ash/common/ash_switches.h"

#include "ash/common/session/session_state_delegate.h"

#include "ash/common/shell_window_ids.h"

+#include "ash/common/wm_shell.h"

#include "ash/shell.h"

#include "ash/wm/lock_state_controller.h"

#include "ash/wm/maximize_mode/maximize_mode_controller.h"

@@ -71,12 +72,12 @@ void PowerButtonController::OnPowerButtonEvent(

->maximize_mode_controller()

->IsMaximizeModeWindowManagerEnabled()) {

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

- ash::TAKE_SCREENSHOT);

+ TAKE_SCREENSHOT);

return;

}

const SessionStateDelegate* session_state_delegate =

- Shell::GetInstance()->session_state_delegate();

+ WmShell::Get()->GetSessionStateDelegate();

if (has_legacy_power_button_) {

// If power button releases won't get reported correctly because we're not

// running on official hardware, just lock the screen or shut down

@@ -123,7 +124,7 @@ void PowerButtonController::OnLockButtonEvent(

lock_button_down_ = down;

const SessionStateDelegate* session_state_delegate =

- Shell::GetInstance()->session_state_delegate();

+ WmShell::Get()->GetSessionStateDelegate();

if (!session_state_delegate->CanLockScreen() ||

session_state_delegate->IsScreenLocked() ||

controller_->LockRequested() || controller_->ShutdownRequested()) {