diff options
| author | johnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-22 22:35:22 +0000 |
|---|---|---|
| committer | johnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-22 22:35:22 +0000 |
| commit | 096d5ac1832c96d25a28d6c3cb1bd710d0e73042 (patch) | |
| tree | b9d324610d111f00d16847a669c389c7af1fbd90 | |
| parent | 3f36515ae1f3a93c3afc4d313be119200a85b78d (diff) | |
| download | chromium_src-096d5ac1832c96d25a28d6c3cb1bd710d0e73042.zip chromium_src-096d5ac1832c96d25a28d6c3cb1bd710d0e73042.tar.gz chromium_src-096d5ac1832c96d25a28d6c3cb1bd710d0e73042.tar.bz2 | |
When the user cancels the sync setup, it should not cause an unrecoverable error in the sync service. Setting the abort-expected flag causes the resulting shutdown to be clean.
BUG=49367
TEST=see bug for procedure
Review URL: http://codereview.chromium.org/3029022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53405 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/sync/profile_sync_service.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc index 8b21a52..2b9098b 100644 --- a/chrome/browser/sync/profile_sync_service.cc +++ b/chrome/browser/sync/profile_sync_service.cc @@ -615,6 +615,7 @@ void ProfileSyncService::OnUserCancelledDialog() { if (!profile_->GetPrefs()->GetBoolean(prefs::kSyncHasSetupCompleted)) { // A sync dialog was aborted before authentication. // Rollback. + expect_sync_configuration_aborted_ = true; DisableForUser(); } wizard_.SetParent(NULL); |