OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/chromeos/login/login_performer.h" | 5 #include "chrome/browser/chromeos/login/login_performer.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
171 default: | 171 default: |
172 NOTREACHED(); | 172 NOTREACHED(); |
173 return; | 173 return; |
174 } | 174 } |
175 | 175 |
176 if (!using_oauth_) { | 176 if (!using_oauth_) { |
177 // Fetch cookies, tokens for the loaded profile only if authentication | 177 // Fetch cookies, tokens for the loaded profile only if authentication |
178 // was performed via ClientLogin. We don't need this in the case when | 178 // was performed via ClientLogin. We don't need this in the case when |
179 // we use extension + OAuth1 access token check flow. | 179 // we use extension + OAuth1 access token check flow. |
180 LoginUtils::Get()->FetchCookies(profile, credentials_); | 180 LoginUtils::Get()->FetchCookies(profile, credentials_); |
| 181 } else { |
| 182 LoginUtils::Get()->StartTokenServices(profile); |
181 } | 183 } |
182 LoginUtils::Get()->StartSync(profile, credentials_); | 184 LoginUtils::Get()->StartSync(profile, credentials_); |
183 credentials_ = GaiaAuthConsumer::ClientLoginResult(); | 185 credentials_ = GaiaAuthConsumer::ClientLoginResult(); |
184 | 186 |
185 // Don't unlock screen if it was locked while we're waiting | 187 // Don't unlock screen if it was locked while we're waiting |
186 // for initial online auth. | 188 // for initial online auth. |
187 if (ScreenLocker::default_screen_locker() && | 189 if (ScreenLocker::default_screen_locker() && |
188 !initial_online_auth_pending_) { | 190 !initial_online_auth_pending_) { |
189 DVLOG(1) << "Online login OK - unlocking screen."; | 191 DVLOG(1) << "Online login OK - unlocking screen."; |
190 RequestScreenUnlock(); | 192 RequestScreenUnlock(); |
(...skipping 394 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
585 profile, | 587 profile, |
586 username_, | 588 username_, |
587 password_, | 589 password_, |
588 captcha_token_, | 590 captcha_token_, |
589 captcha_)); | 591 captcha_)); |
590 } | 592 } |
591 password_.clear(); | 593 password_.clear(); |
592 } | 594 } |
593 | 595 |
594 } // namespace chromeos | 596 } // namespace chromeos |
OLD | NEW |