Chromium Code Reviews| Index: chrome/browser/chromeos/login/existing_user_controller.cc |
| diff --git a/chrome/browser/chromeos/login/existing_user_controller.cc b/chrome/browser/chromeos/login/existing_user_controller.cc |
| index aa9615b1e6b1bcb1f88d2ad8ff16260567373635..109044ec8f2a4dfa2a928e8f22941fc6245a145e 100644 |
| --- a/chrome/browser/chromeos/login/existing_user_controller.cc |
| +++ b/chrome/browser/chromeos/login/existing_user_controller.cc |
| @@ -589,9 +589,15 @@ void ExistingUserController::OnAuthSuccess(const UserContext& user_context) { |
| StopPublicSessionAutoLoginTimer(); |
| + // Truth table of |has_auth_cookies|: |
| + // Regular SAML |
| + // /ServiceLogin T T |
| + // /ChromeOsEmbeddedSetup F T |
| + // Bootstrap exp. F F |
|
Mattias Nissler (ping if slow)
2015/03/25 08:28:18
nit: It's totally unclear to me what "Bootstrap ex
xiyuan
2015/03/25 19:26:19
Update to "Bootstrap experiment". It is an interna
|
| const bool has_auth_cookies = |
| login_performer_->auth_mode() == LoginPerformer::AUTH_MODE_EXTENSION && |
| - user_context.GetAuthCode().empty() && |
| + (user_context.GetAuthCode().empty() || |
| + user_context.GetAuthFlow() == UserContext::AUTH_FLOW_GAIA_WITH_SAML) && |
| user_context.GetAuthFlow() != UserContext::AUTH_FLOW_EASY_BOOTSTRAP; |
| // LoginPerformer instance will delete itself in case of successful auth. |