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

Unified Diff: ash/common/shelf/shelf_locking_manager.cc

Issue 2739763003: Moves maintaining ShellObservers back to Shell (Closed)
Patch Set: merge Created 3 years, 9 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/common/shelf/shelf_layout_manager.cc ('k') | ash/common/shelf/wm_shelf.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/shelf/shelf_locking_manager.cc
diff --git a/ash/common/shelf/shelf_locking_manager.cc b/ash/common/shelf/shelf_locking_manager.cc
index aabc1450adf76c72180e77a7fd6825f3ee60e0a6..fa72ac1e045cb28a6f6a3b6597e1c24732dda65e 100644
--- a/ash/common/shelf/shelf_locking_manager.cc
+++ b/ash/common/shelf/shelf_locking_manager.cc
@@ -7,6 +7,7 @@
#include "ash/common/session/session_state_delegate.h"
#include "ash/common/shelf/wm_shelf.h"
#include "ash/common/wm_shell.h"
+#include "ash/shell.h"
namespace ash {
@@ -17,13 +18,13 @@ ShelfLockingManager::ShelfLockingManager(WmShelf* shelf) : shelf_(shelf) {
delegate->GetSessionState() != session_manager::SessionState::ACTIVE;
screen_locked_ = delegate->IsScreenLocked();
delegate->AddSessionStateObserver(this);
- WmShell::Get()->AddShellObserver(this);
+ Shell::GetInstance()->AddShellObserver(this);
}
ShelfLockingManager::~ShelfLockingManager() {
WmShell::Get()->RemoveLockStateObserver(this);
WmShell::Get()->GetSessionStateDelegate()->RemoveSessionStateObserver(this);
- WmShell::Get()->RemoveShellObserver(this);
+ Shell::GetInstance()->RemoveShellObserver(this);
}
void ShelfLockingManager::OnLockStateChanged(bool locked) {
« no previous file with comments | « ash/common/shelf/shelf_layout_manager.cc ('k') | ash/common/shelf/wm_shelf.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698