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

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

Issue 15421011: Use OAuth2 token for sync (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 7 years, 6 months 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/profile_sync_service_android.cc
diff --git a/chrome/browser/sync/profile_sync_service_android.cc b/chrome/browser/sync/profile_sync_service_android.cc
index 1436a41c5af283805ff579cc0a1141d1f02dd835..b6edff6858a74b4366de348defeb5847ef555df5 100644
--- a/chrome/browser/sync/profile_sync_service_android.cc
+++ b/chrome/browser/sync/profile_sync_service_android.cc
@@ -252,13 +252,13 @@ void ProfileSyncServiceAndroid::SignInSync(
// happen normally if (for example) the user closes and reopens the sync
// settings window quickly during initial startup.
if (sync_service_->IsSyncEnabledAndLoggedIn() &&
- sync_service_->IsSyncTokenAvailable() &&
+ sync_service_->IsOAuthRefreshTokenAvailable() &&
sync_service_->HasSyncSetupCompleted()) {
return;
}
if (!sync_service_->IsSyncEnabledAndLoggedIn() ||
- !sync_service_->IsSyncTokenAvailable()) {
+ !sync_service_->IsOAuthRefreshTokenAvailable()) {
// Set the currently-signed-in username, fetch an auth token if necessary,
// and enable sync.
std::string name = ConvertJavaStringToUTF8(env, username);
« no previous file with comments | « chrome/browser/sync/profile_sync_service.cc ('k') | chrome/browser/sync/profile_sync_service_autofill_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698