| Index: chrome/browser/sync/sync_setup_wizard.h
|
| diff --git a/chrome/browser/sync/sync_setup_wizard.h b/chrome/browser/sync/sync_setup_wizard.h
|
| index 1e3c24299fb58ceb7a8394e5a1895a299ee88c37..acd46505c0ecc0e194d83c81f2d4aaff00860a9d 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);
|
|
|