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

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

Issue 11649055: OAuth2 sign-in flow for ChromeOS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years 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/signin/signin_manager.cc
diff --git a/chrome/browser/signin/signin_manager.cc b/chrome/browser/signin/signin_manager.cc
index 47cbed0ef7a4c396dec96b75e269b647713fd19b..7b455924be1591324e092be7eda5c87fd409fe1e 100644
--- a/chrome/browser/signin/signin_manager.cc
+++ b/chrome/browser/signin/signin_manager.cc
@@ -130,9 +130,11 @@ void SigninManager::Initialize(Profile* profile) {
TokenService* token_service = TokenServiceFactory::GetForProfile(profile_);
if (token_service) {
token_service->Initialize(GaiaConstants::kChromeSource, profile_);
+#if !defined(OS_CHROMEOS)
if (!authenticated_username_.empty()) {
token_service->LoadTokensFromDB();
}
+#endif
}
if (!user.empty() && !IsAllowedUsername(user)) {
// User is signed in, but the username is invalid - the administrator must

Powered by Google App Engine
This is Rietveld 408576698