diff options
| author | binji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-22 08:39:11 +0000 |
|---|---|---|
| committer | binji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-22 08:39:11 +0000 |
| commit | bc44b8d84b4df2cf3c1dfdb00c35584e3be1cce7 (patch) | |
| tree | a114b2a1c50d80224d4e84cceac38b181cd12d13 /chrome/browser/sync/sync_setup_flow.cc | |
| parent | 2a4ebc7870781606a6a531e5727d818e6189056e (diff) | |
| download | chromium_src-bc44b8d84b4df2cf3c1dfdb00c35584e3be1cce7.zip chromium_src-bc44b8d84b4df2cf3c1dfdb00c35584e3be1cce7.tar.gz chromium_src-bc44b8d84b4df2cf3c1dfdb00c35584e3be1cce7.tar.bz2 | |
Prevent NOTREACHED when switching from not syncing to syncing passwords.
This shouldn't occur anymore, but prevent the failure anyway.
BUG=89063
TEST=none
Review URL: http://codereview.chromium.org/7471013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93584 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/sync_setup_flow.cc')
| -rw-r--r-- | chrome/browser/sync/sync_setup_flow.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/chrome/browser/sync/sync_setup_flow.cc b/chrome/browser/sync/sync_setup_flow.cc index fbcdb63..8e3b5c0 100644 --- a/chrome/browser/sync/sync_setup_flow.cc +++ b/chrome/browser/sync/sync_setup_flow.cc @@ -48,8 +48,12 @@ void GetArgsForEnterPassphrase(bool tried_creating_explicit_passphrase, // Returns the next step for the non-fatal error case. SyncSetupWizard::State GetStepForNonFatalError(ProfileSyncService* service) { - if (service->IsPassphraseRequired() && service->IsUsingSecondaryPassphrase()) + if (service->IsPassphraseRequired()) { + if (service->IsUsingSecondaryPassphrase()) return SyncSetupWizard::ENTER_PASSPHRASE; + else + return SyncSetupWizard::GAIA_LOGIN; + } const GoogleServiceAuthError& error = service->GetAuthError(); if (error.state() == GoogleServiceAuthError::INVALID_GAIA_CREDENTIALS || |