diff options
| author | dantasse@chromium.org <dantasse@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-25 22:38:00 +0000 |
|---|---|---|
| committer | dantasse@chromium.org <dantasse@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-25 22:38:00 +0000 |
| commit | 8c94d63f7a6e071bdc90648d614f1825cea195d0 (patch) | |
| tree | 190f58e4bf11d699fe558561118a98db92671efc /chrome/browser/sync/sync_setup_wizard.h | |
| parent | c5ab18a10e5ab5f10fb5856cb83d3c4835fd9e8c (diff) | |
| download | chromium_src-8c94d63f7a6e071bdc90648d614f1825cea195d0.zip chromium_src-8c94d63f7a6e071bdc90648d614f1825cea195d0.tar.gz chromium_src-8c94d63f7a6e071bdc90648d614f1825cea195d0.tar.bz2 | |
New HTML Sync Setup UI.
Was reverted because of a valgrind error. This is try #2.
Old flow:
- type username/password. wait for Gaia auth and initial sync (with throbber)
- success! or error.
New flow:
- type username/password. wait for Gaia auth. (with throbber)
- error, or choose your datatypes. you can choose "keep everything synced", which will sync all present and future datatypes, or you can pick one by one.
- wait for initial sync (with throbber)
- success! or error, which brings you back to the gaia auth screen.
Smaller details:
- removed the Customize button from gaia_login.html; further removal of the old native Customize dialog to follow.
- added a logging statement to log if you cancel from the Choose Data Types screen.
- added a pref to the profile for whether you want to "keep everything synced" or choose one by one.
- added a couple more strings. Not final yet, I don't think.
BUG=45869
TEST=Exercise all the different paths through the login flow.
Review URL: http://codereview.chromium.org/2880001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50902 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/sync_setup_wizard.h')
| -rw-r--r-- | chrome/browser/sync/sync_setup_wizard.h | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/chrome/browser/sync/sync_setup_wizard.h b/chrome/browser/sync/sync_setup_wizard.h index 1e3c242..acd4650 100644 --- a/chrome/browser/sync/sync_setup_wizard.h +++ b/chrome/browser/sync/sync_setup_wizard.h @@ -16,10 +16,20 @@ class SyncSetupWizard { enum State { // Show the Google Account login UI. GAIA_LOGIN = 0, - // A login attempt succeeded. Depending on initial conditions, this may - // cause a transition to DONE, or to wait for an explicit transition (via - // Step) to the next state. + // A login attempt succeeded. This will wait for an explicit transition + // (via Step) to the next state. GAIA_SUCCESS, + // Show the screen that lets you click either "Keep everything synced" or + // "Choose which data types to sync", and checkboxes for each data type. + CHOOSE_DATA_TYPES, + // Show the screen that lets you create a passphrase (if you've never set + // one up before). + CREATE_PASSPHRASE, + // Show the screen that lets you enter the passphrase (if you've set one up + // on another machine). + ENTER_PASSPHRASE, + // Show the screen that lets you reset your passphrase (if you forgot it). + RESET_PASSPHRASE, // The panic switch. Something went terribly wrong during setup and we // can't recover. FATAL_ERROR, @@ -62,9 +72,6 @@ class SyncSetupWizard { ProfileSyncService* service_; - // The use of ShowHtmlDialog and SyncSetupFlowContainer is disabled on Linux - // until BrowserShowHtmlDialog() is implemented. - // See: http://code.google.com/p/chromium/issues/detail?id=25260 SyncSetupFlowContainer* flow_container_; DISALLOW_COPY_AND_ASSIGN(SyncSetupWizard); |