diff options
| author | pneubeck <pneubeck@chromium.org> | 2014-10-13 06:35:52 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-13 13:36:01 +0000 |
| commit | 02708e2dd0522cdf46f6c370b0a4bd332f9ceabf (patch) | |
| tree | 808a567a20fc2b3e472a67f0ba020bc3c6ea2a20 /chromeos/login | |
| parent | ce1012f07a698becd14d11b5949b47bf425c624f (diff) | |
| download | chromium_src-02708e2dd0522cdf46f6c370b0a4bd332f9ceabf.zip chromium_src-02708e2dd0522cdf46f6c370b0a4bd332f9ceabf.tar.gz chromium_src-02708e2dd0522cdf46f6c370b0a4bd332f9ceabf.tar.bz2 | |
Remove crash on retail mode startup.
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}
Diffstat (limited to 'chromeos/login')
| -rw-r--r-- | chromeos/login/login_state.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chromeos/login/login_state.cc b/chromeos/login/login_state.cc index b65b0fd..ea63c8c 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 { |