diff options
| author | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-13 18:21:55 +0000 |
|---|---|---|
| committer | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-13 18:21:55 +0000 |
| commit | 5e69dfaebbceaecc97de442238d4ad254b0cece1 (patch) | |
| tree | 696133ceb29ebf55293d5705cca50d07d1ca6ec7 /chrome | |
| parent | af3176a286d63c0db0ca7370e37b8e452e2a0200 (diff) | |
| download | chromium_src-5e69dfaebbceaecc97de442238d4ad254b0cece1.zip chromium_src-5e69dfaebbceaecc97de442238d4ad254b0cece1.tar.gz chromium_src-5e69dfaebbceaecc97de442238d4ad254b0cece1.tar.bz2 | |
sync (cros): Don't try to migrate tokens on cros.
BUG=chromium-os:7396
TEST=None :(
Review URL: http://codereview.chromium.org/3710004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62427 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/sync/profile_sync_service.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc index 41069c8..6798b60 100644 --- a/chrome/browser/sync/profile_sync_service.cc +++ b/chrome/browser/sync/profile_sync_service.cc @@ -179,6 +179,12 @@ void ProfileSyncService::Initialize() { // be done by the wizard. StartUp(); } else { + if (!cros_user_.empty()) { + // We don't attempt migration on cros, as we should just get new + // credentials from the login manager on startup. + return; + } + // Try to migrate the tokens (if that hasn't already succeeded). if (!profile()->GetPrefs()->GetBoolean(prefs::kSyncCredentialsMigrated)) { token_migrator_.reset(new TokenMigrator(this, profile_->GetPath())); |