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

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

Issue 8303004: [Sync] Only step to done in wizard if encryption is complete. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add case to sync setup flow Created 9 years, 2 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
« no previous file with comments | « chrome/browser/sync/profile_sync_service.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/sync_setup_flow.cc
diff --git a/chrome/browser/sync/sync_setup_flow.cc b/chrome/browser/sync/sync_setup_flow.cc
index f52ac2e4fbc102bed5cc1d6da1183ba0bb4025ed..e83183122a0d0984bc06b0abf6acce58beaa5b39 100644
--- a/chrome/browser/sync/sync_setup_flow.cc
+++ b/chrome/browser/sync/sync_setup_flow.cc
@@ -334,7 +334,8 @@ void SyncSetupFlow::OnUserConfigured(const SyncConfiguration& configuration) {
// need to hang around waiting for encryption to happen, just exit). This call
// to IsPassphraseRequiredForDecryption() takes into account the data types
// we just enabled/disabled.
- if (!service_->IsPassphraseRequiredForDecryption()) {
+ if (!service_->IsPassphraseRequiredForDecryption() &&
+ !service_->encryption_pending()) {
Advance(SyncSetupWizard::DONE);
} else if (!set_new_decryption_passphrase) {
// We need a passphrase, but the user did not provide one, so transition
« no previous file with comments | « chrome/browser/sync/profile_sync_service.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698