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

Unified Diff: ash/shelf/shelf_locking_manager.cc

Issue 2808723004: Renames WmShell to ShellPort (Closed)
Patch Set: feedback Created 3 years, 8 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/shelf/shelf_locking_manager.cc
diff --git a/ash/shelf/shelf_locking_manager.cc b/ash/shelf/shelf_locking_manager.cc
index dd1180b41f12e483ddf6a321a1226054efbc25a9..9a10b8fca62d5c0c7da6d48da37323cedb978ca4 100644
--- a/ash/shelf/shelf_locking_manager.cc
+++ b/ash/shelf/shelf_locking_manager.cc
@@ -7,14 +7,14 @@
#include "ash/session/session_controller.h"
#include "ash/shelf/wm_shelf.h"
#include "ash/shell.h"
-#include "ash/wm_shell.h"
+#include "ash/shell_port.h"
namespace ash {
ShelfLockingManager::ShelfLockingManager(WmShelf* shelf)
: shelf_(shelf), stored_alignment_(shelf->GetAlignment()) {
DCHECK(shelf_);
- WmShell::Get()->AddLockStateObserver(this);
+ ShellPort::Get()->AddLockStateObserver(this);
SessionController* controller = Shell::Get()->session_controller();
session_locked_ =
controller->GetSessionState() != session_manager::SessionState::ACTIVE;
@@ -24,7 +24,7 @@ ShelfLockingManager::ShelfLockingManager(WmShelf* shelf)
}
ShelfLockingManager::~ShelfLockingManager() {
- WmShell::Get()->RemoveLockStateObserver(this);
+ ShellPort::Get()->RemoveLockStateObserver(this);
Shell::Get()->session_controller()->RemoveSessionStateObserver(this);
Shell::Get()->RemoveShellObserver(this);
}

Powered by Google App Engine
This is Rietveld 408576698