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

Unified Diff: ash/shell/shell_delegate_impl.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/mus/shell_delegate_mus.cc ('k') | ash/test/ash_test_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell/shell_delegate_impl.cc
diff --git a/ash/shell/shell_delegate_impl.cc b/ash/shell/shell_delegate_impl.cc
index 046458fd42b969feebcb0431298cade94bf04cdb..73af0055b46508e999bdcbfbcb95107f70dabe40 100644
--- a/ash/shell/shell_delegate_impl.cc
+++ b/ash/shell/shell_delegate_impl.cc
@@ -137,10 +137,11 @@ class SessionStateDelegateImpl : public SessionStateDelegate {
bool IsUserSessionBlocked() const override {
return !IsActiveUserSessionStarted() || IsScreenLocked();
}
- SessionState GetSessionState() const override {
+ session_manager::SessionState GetSessionState() const override {
// Assume that if session is not active we're at login.
- return IsActiveUserSessionStarted() ? SESSION_STATE_ACTIVE
- : SESSION_STATE_LOGIN_PRIMARY;
+ return IsActiveUserSessionStarted()
+ ? session_manager::SessionState::ACTIVE
+ : session_manager::SessionState::LOGIN_PRIMARY;
}
const user_manager::UserInfo* GetUserInfo(UserIndex index) const override {
return user_info_.get();
« no previous file with comments | « ash/mus/shell_delegate_mus.cc ('k') | ash/test/ash_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698