chrome/browser/sync/sync_setup_wizard.h - Issue 7093004: Sync: Refactor the ProfileSyncService and sync setup flow to remove use of WebUI from PSS.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/sync/sync_setup_wizard.h

Issue 7093004: Sync: Refactor the ProfileSyncService and sync setup flow to remove use of WebUI from PSS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Win fix. Created 9 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/sync/sync_setup_flow.cc ('k') | chrome/browser/sync/sync_setup_wizard.cc » ('j') | chrome/browser/ui/webui/options/sync_setup_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 4e28d8c4e585bc1d8b0a2d53165a355639a82b14..6661f774bc682b8ecabee7cdc9b2671e24c81c9d 100644

--- a/chrome/browser/sync/sync_setup_wizard.h

+++ b/chrome/browser/sync/sync_setup_wizard.h

@@ -34,13 +34,16 @@ class SyncSetupWizard {

CONFIGURE,

// Show the screen that prompts for your passphrase

ENTER_PASSPHRASE,

- // The panic switch. Something went terribly wrong during setup and we

- // can't recover.

+ // An error has occurred in the backend. The next appropriate step is picked

+ // based on which error has occurred.

+ NONFATAL_ERROR,

tim (not reviewing) 2011/06/09 14:50:36 Please add unittests for this new state.

+ // The panic switch. Something went terribly wrong during setup and we can't

+ // recover.

FATAL_ERROR,

// The client can't set up sync at the moment due to a concurrent operation

// to clear cloud data being in progress on the server.

SETUP_ABORTED_BY_PENDING_CLEAR,

- // Loading screen with spinny throbber.

+ // Loading screen with throbber.

SETTING_UP,

// A catch-all done case for any setup process.

DONE