diff options
| author | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-16 17:59:35 +0000 |
|---|---|---|
| committer | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-16 17:59:35 +0000 |
| commit | 7d855571d93760388020b3621169b6690e86060a (patch) | |
| tree | 75d6acc8b6537d2d853d3967bb6f8a7cf4221c62 /chrome/browser/sync/profile_sync_service.cc | |
| parent | 7ca9c3f63a1b4b66d6c04520a42ceb4f4178508b (diff) | |
| download | chromium_src-7d855571d93760388020b3621169b6690e86060a.zip chromium_src-7d855571d93760388020b3621169b6690e86060a.tar.gz chromium_src-7d855571d93760388020b3621169b6690e86060a.tar.bz2 | |
Moved UI state from ProfileSyncService to SyncUserFlow so it doesn't inappropriately persist.
BUG=74645
TEST=see instructions in bug
Review URL: http://codereview.chromium.org/6686023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78392 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/profile_sync_service.cc')
| -rw-r--r-- | chrome/browser/sync/profile_sync_service.cc | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc index 19f6836..f4121b7 100644 --- a/chrome/browser/sync/profile_sync_service.cc +++ b/chrome/browser/sync/profile_sync_service.cc @@ -65,8 +65,6 @@ ProfileSyncService::ProfileSyncService(ProfileSyncFactory* factory, Profile* profile, const std::string& cros_user) : last_auth_error_(AuthError::None()), - tried_creating_explicit_passphrase_(false), - tried_setting_explicit_passphrase_(false), observed_passphrase_required_(false), passphrase_required_for_decryption_(false), passphrase_migration_in_progress_(false), @@ -680,8 +678,6 @@ void ProfileSyncService::OnPassphraseAccepted() { NotifyObservers(); observed_passphrase_required_ = false; - tried_setting_explicit_passphrase_ = false; - tried_creating_explicit_passphrase_ = false; wizard_.Step(SyncSetupWizard::DONE); } @@ -1118,10 +1114,6 @@ void ProfileSyncService::SetPassphrase(const std::string& passphrase, cached_passphrase_.is_creation = is_creation; } - if (is_explicit && is_creation) - tried_creating_explicit_passphrase_ = true; - else if (is_explicit) - tried_setting_explicit_passphrase_ = true; } void ProfileSyncService::EncryptDataTypes( |