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

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

Issue 2416253004: ash: Use session_manager::SessionState (Closed)
Patch Set: fix compile Created 4 years, 2 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/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 05cc9ac9b34ea4edfc2683e373840a9be8a7a1a8..bf2f085cd8f12fca7789a2ff2287d5bb7aef27ab 100644
--- a/ash/common/shelf/shelf_locking_manager.cc
+++ b/ash/common/shelf/shelf_locking_manager.cc
@@ -13,8 +13,7 @@ namespace ash {
ShelfLockingManager::ShelfLockingManager(WmShelf* shelf) : shelf_(shelf) {
WmShell::Get()->AddLockStateObserver(this);
SessionStateDelegate* delegate = WmShell::Get()->GetSessionStateDelegate();
- session_locked_ =
- delegate->GetSessionState() != SessionStateDelegate::SESSION_STATE_ACTIVE;
+ session_locked_ = delegate->GetSessionState() != SessionState::ACTIVE;
screen_locked_ = delegate->IsScreenLocked();
delegate->AddSessionStateObserver(this);
WmShell::Get()->AddShellObserver(this);
@@ -31,9 +30,8 @@ void ShelfLockingManager::OnLockStateChanged(bool locked) {
UpdateLockedState();
}
-void ShelfLockingManager::SessionStateChanged(
- SessionStateDelegate::SessionState state) {
- session_locked_ = state != SessionStateDelegate::SESSION_STATE_ACTIVE;
+void ShelfLockingManager::SessionStateChanged(SessionState state) {
+ session_locked_ = state != SessionState::ACTIVE;
UpdateLockedState();
}

Powered by Google App Engine
This is Rietveld 408576698