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

Unified Diff: chrome/browser/sync/signin_manager.cc

Issue 4980005: Allow sync with 2-factor StrongAuth accounts in ChromeOS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Refactored 2-factor error passing Created 10 years, 1 month 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
Index: chrome/browser/sync/signin_manager.cc
diff --git a/chrome/browser/sync/signin_manager.cc b/chrome/browser/sync/signin_manager.cc
index b64b3bb461a9efb5a06018ea1a4c2f9a221b088e..1a884970b52c131c7a5bc0e6da47d326bc7e8db5 100644
--- a/chrome/browser/sync/signin_manager.cc
+++ b/chrome/browser/sync/signin_manager.cc
@@ -49,9 +49,12 @@ void SigninManager::StartSignIn(const std::string& username,
const std::string& login_token,
const std::string& login_captcha) {
DCHECK(username_.empty());
+#if !defined(OS_CHROMEOS)
// The Sign out should clear the token service credentials.
+ // Note: In CHROMEOS we might have valid credentials but still need to
+ // set up 2-factor authentication.
DCHECK(!profile_->GetTokenService()->AreCredentialsValid());
-
+#endif
username_.assign(username);
password_.assign(password);

Powered by Google App Engine
This is Rietveld 408576698