Skip to content

Commit

Permalink
Remove crash on retail mode startup.
Browse files Browse the repository at this point in the history
This CHECK was originally added because retail mode was supposed to not be supported anymore in R38:
https://chromium.googlesource.com/chromium/src.git/+/0dfff001d347879953bbeaa4e128c24e4e9fcc94

Since too many crashes were reported for R38, this removes the CHECK to support retail mode again.

BUG=422095
TEST=Ran retail mode in R38 and verified that it correctly logs in.

Review URL: https://codereview.chromium.org/651843002

Cr-Commit-Position: refs/heads/master@{#299293}
  • Loading branch information
pneubeck authored and Commit bot committed Oct 13, 2014
1 parent ce1012f commit 02708e2
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions chromeos/login/login_state.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 {
Expand Down

0 comments on commit 02708e2

Please sign in to comment.