diff options
| author | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-20 14:45:46 +0000 |
|---|---|---|
| committer | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-20 14:45:46 +0000 |
| commit | 54e6e79cce665b06c965d58852f0c6362b9ba567 (patch) | |
| tree | f02a6f7a81c6887236a9924f617af9c7c8e659d9 /chrome/browser/sync/sync_setup_flow.h | |
| parent | 2aec43172688976197ded8e35a485c7351ff30ed (diff) | |
| download | chromium_src-54e6e79cce665b06c965d58852f0c6362b9ba567.zip chromium_src-54e6e79cce665b06c965d58852f0c6362b9ba567.tar.gz chromium_src-54e6e79cce665b06c965d58852f0c6362b9ba567.tar.bz2 | |
sync: fix passphrase bootstrapping and more.
BUG=59684, 59631
TEST=Enable password sync on two clients with default gaia passphrase. Change it to use a secondary on one of the clients, wait for error to surface on other client, restart chrome, notice "sync error", enter passphrase, have things work out. Also, password sync integration test.
Review URL: http://codereview.chromium.org/3803012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63212 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/sync_setup_flow.h')
| -rw-r--r-- | chrome/browser/sync/sync_setup_flow.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/browser/sync/sync_setup_flow.h b/chrome/browser/sync/sync_setup_flow.h index 292d01b..2879146 100644 --- a/chrome/browser/sync/sync_setup_flow.h +++ b/chrome/browser/sync/sync_setup_flow.h @@ -58,6 +58,11 @@ class SyncSetupFlow : public HtmlDialogUIDelegate { ProfileSyncService* service, DictionaryValue* args); + // Fills |args| for the enter passphrase screen. + static void GetArgsForEnterPassphrase( + const ProfileSyncService* service, + DictionaryValue* args); + // Triggers a state machine transition to advance_state. void Advance(SyncSetupWizard::State advance_state); |