Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2515)

Unified Diff: ash/wm/lock_state_controller.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
« no previous file with comments | « ash/wm/lock_layout_manager.cc ('k') | ash/wm/lock_state_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/lock_state_controller.cc
diff --git a/ash/wm/lock_state_controller.cc b/ash/wm/lock_state_controller.cc
index 08c314c1fac6195ebb16ce67e4027f0964786ee6..2ad8a595af5095368083d65c6cfb9f20a600e384 100644
--- a/ash/wm/lock_state_controller.cc
+++ b/ash/wm/lock_state_controller.cc
@@ -11,10 +11,10 @@
#include "ash/cancel_mode.h"
#include "ash/common/accessibility_delegate.h"
#include "ash/common/ash_switches.h"
+#include "ash/common/shell_delegate.h"
#include "ash/common/shell_window_ids.h"
#include "ash/common/wm_shell.h"
#include "ash/shell.h"
-#include "ash/shell_delegate.h"
#include "ash/wm/session_state_animator.h"
#include "ash/wm/session_state_animator_impl.h"
#include "base/bind.h"
@@ -214,7 +214,7 @@ void LockStateController::SetLockScreenDisplayedCallback(
void LockStateController::OnHostCloseRequested(
const aura::WindowTreeHost* host) {
- Shell::GetInstance()->delegate()->Exit();
+ WmShell::Get()->delegate()->Exit();
}
void LockStateController::OnLoginStateChanged(LoginStatus status) {
@@ -333,7 +333,7 @@ void LockStateController::OnRealPowerTimeout() {
DCHECK(shutting_down_);
#if defined(OS_CHROMEOS)
if (!base::SysInfo::IsRunningOnChromeOS()) {
- ShellDelegate* delegate = Shell::GetInstance()->delegate();
+ ShellDelegate* delegate = WmShell::Get()->delegate();
if (delegate) {
delegate->Exit();
return;
« no previous file with comments | « ash/wm/lock_layout_manager.cc ('k') | ash/wm/lock_state_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698