chrome/browser/sync/sync_setup_flow.cc - Issue 6581023: Merge 75769 - When enabling password sync manually, use the passphrase migrat...

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_flow.cc

Issue 6581023: Merge 75769 - When enabling password sync manually, use the passphrase migrat... (Closed) Base URL: svn://svn.chromium.org/chrome/branches/648/src/

Patch Set: Created 9 years, 10 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

Index: chrome/browser/sync/sync_setup_flow.cc

===================================================================

--- chrome/browser/sync/sync_setup_flow.cc (revision 75848)

+++ chrome/browser/sync/sync_setup_flow.cc (working copy)

@@ -547,7 +547,8 @@

switch (state) {

case SyncSetupWizard::GAIA_LOGIN:

return current_state_ == SyncSetupWizard::FATAL_ERROR ||

- current_state_ == SyncSetupWizard::GAIA_LOGIN;

+ current_state_ == SyncSetupWizard::GAIA_LOGIN ||

+ current_state_ == SyncSetupWizard::SETTING_UP;

case SyncSetupWizard::GAIA_SUCCESS:

return current_state_ == SyncSetupWizard::GAIA_LOGIN;

case SyncSetupWizard::CONFIGURE:

« no previous file with comments | « chrome/browser/sync/profile_sync_service.cc ('k') | no next file » | no next file with comments »