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

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

Issue 7466024: [Sync] Support receiving early passphrase required information in Sync UI. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove old function Created 9 years, 5 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/sync_setup_flow.cc
diff --git a/chrome/browser/sync/sync_setup_flow.cc b/chrome/browser/sync/sync_setup_flow.cc
index 61c1fb54e8dec839847ea5b5e696a2e98032bb3c..7f6e354aa21131c1b0bf6e85842192361b773900 100644
--- a/chrome/browser/sync/sync_setup_flow.cc
+++ b/chrome/browser/sync/sync_setup_flow.cc
@@ -271,10 +271,14 @@ void SyncSetupFlow::OnUserConfigured(const SyncConfiguration& configuration) {
!configuration.use_secondary_passphrase ||
configuration.secondary_passphrase.length() > 0);
- if (configuration.use_secondary_passphrase &&
- !service_->IsUsingSecondaryPassphrase()) {
- service_->SetPassphrase(configuration.secondary_passphrase, true, true);
- tried_creating_explicit_passphrase_ = true;
+ if (configuration.use_secondary_passphrase) {
+ if (!service_->IsUsingSecondaryPassphrase()) {
+ service_->SetPassphrase(configuration.secondary_passphrase, true, true);
+ tried_creating_explicit_passphrase_ = true;
+ } else {
+ service_->SetPassphrase(configuration.secondary_passphrase, true, false);
+ tried_setting_explicit_passphrase_ = true;
+ }
}
service_->OnUserChoseDatatypes(configuration.sync_everything,

Powered by Google App Engine
This is Rietveld 408576698