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

Unified Diff: chromeos/login/login_state.cc

Issue 651843002: Remove crash on retail mode startup. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/login/login_state.cc
diff --git a/chromeos/login/login_state.cc b/chromeos/login/login_state.cc
index b65b0fdf548f58b3d71d1b1d0d22fbeb42088e19..ea63c8ca9ba302f0092de33128f122a589485773 100644
--- a/chromeos/login/login_state.cc
+++ b/chromeos/login/login_state.cc
@@ -68,7 +68,6 @@ void LoginState::SetLoggedInStateAndPrimaryUser(
}
void LoginState::SetLoggedInState(LoggedInState state, LoggedInUserType type) {
- CHECK_NE(LOGGED_IN_USER_RETAIL_MODE, type);
if (state == logged_in_state_ && type == logged_in_user_type_)
return;
VLOG(1) << "LoggedInState: " << state << " UserType: " << type;
@@ -97,7 +96,8 @@ bool LoginState::IsGuestSessionUser() const {
}
bool LoginState::IsPublicSessionUser() const {
- return logged_in_user_type_ == LOGGED_IN_USER_PUBLIC_ACCOUNT;
+ return logged_in_user_type_ == LOGGED_IN_USER_PUBLIC_ACCOUNT ||
+ logged_in_user_type_ == LOGGED_IN_USER_RETAIL_MODE;
}
bool LoginState::IsKioskApp() const {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698