diff options
| author | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-01 18:49:44 +0000 |
|---|---|---|
| committer | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-01 18:49:44 +0000 |
| commit | b29974139602e00760b943340523b45b3296bb8f (patch) | |
| tree | 050d942c2078306f992761bbfdab22cff552678a /chrome/browser/sync/sync_setup_flow.cc | |
| parent | 8a7299801481da83df1ecf830200b84b192a6876 (diff) | |
| download | chromium_src-b29974139602e00760b943340523b45b3296bb8f.zip chromium_src-b29974139602e00760b943340523b45b3296bb8f.tar.gz chromium_src-b29974139602e00760b943340523b45b3296bb8f.tar.bz2 | |
Sync: Remove the passphrase page and inline passphrase input in the Customize screen.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/7076025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87509 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 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/browser/sync/sync_setup_flow.cc b/chrome/browser/sync/sync_setup_flow.cc index 3ac1616..034edf4 100644 --- a/chrome/browser/sync/sync_setup_flow.cc +++ b/chrome/browser/sync/sync_setup_flow.cc @@ -151,6 +151,7 @@ void SyncSetupFlow::GetArgsForEnterPassphrase( bool tried_creating_explicit_passphrase, bool tried_setting_explicit_passphrase, DictionaryValue* args) { + args->SetBoolean("show_passphrase", true); args->SetBoolean("passphrase_creation_rejected", tried_creating_explicit_passphrase); args->SetBoolean("passphrase_setting_rejected", @@ -350,6 +351,7 @@ void SyncSetupFlow::ActivateState(SyncSetupWizard::State state) { } case SyncSetupWizard::ENTER_PASSPHRASE: { DictionaryValue args; + SyncSetupFlow::GetArgsForConfigure(service_, &args); SyncSetupFlow::GetArgsForEnterPassphrase( tried_creating_explicit_passphrase_, tried_setting_explicit_passphrase_, |