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

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

Issue 2416253004: ash: Use session_manager::SessionState (Closed)
Patch Set: add comment about session state in SessionStaetDelegateChromeos 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
« no previous file with comments | « ash/common/shelf/shelf_locking_manager.h ('k') | ash/common/shelf/shelf_locking_manager_unittest.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 05cc9ac9b34ea4edfc2683e373840a9be8a7a1a8..aabc1450adf76c72180e77a7fd6825f3ee60e0a6 100644
--- a/ash/common/shelf/shelf_locking_manager.cc
+++ b/ash/common/shelf/shelf_locking_manager.cc
@@ -14,7 +14,7 @@ ShelfLockingManager::ShelfLockingManager(WmShelf* shelf) : shelf_(shelf) {
WmShell::Get()->AddLockStateObserver(this);
SessionStateDelegate* delegate = WmShell::Get()->GetSessionStateDelegate();
session_locked_ =
- delegate->GetSessionState() != SessionStateDelegate::SESSION_STATE_ACTIVE;
+ delegate->GetSessionState() != session_manager::SessionState::ACTIVE;
screen_locked_ = delegate->IsScreenLocked();
delegate->AddSessionStateObserver(this);
WmShell::Get()->AddShellObserver(this);
@@ -32,8 +32,8 @@ void ShelfLockingManager::OnLockStateChanged(bool locked) {
}
void ShelfLockingManager::SessionStateChanged(
- SessionStateDelegate::SessionState state) {
- session_locked_ = state != SessionStateDelegate::SESSION_STATE_ACTIVE;
+ session_manager::SessionState state) {
+ session_locked_ = state != session_manager::SessionState::ACTIVE;
UpdateLockedState();
}
« no previous file with comments | « ash/common/shelf/shelf_locking_manager.h ('k') | ash/common/shelf/shelf_locking_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698