chrome/browser/sync/sync_setup_flow.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_flow.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: Add tests, fixes. 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

« chrome/browser/sync/profile_sync_service.cc ('K') | « chrome/browser/sync/profile_sync_service.cc ('k') | chrome/browser/sync/sync_setup_flow.cc » ('j') | chrome/browser/sync/sync_setup_wizard_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/sync_setup_flow.h

diff --git a/chrome/browser/sync/sync_setup_flow.h b/chrome/browser/sync/sync_setup_flow.h

index 73b574cba69ec19f2fcdf87a22296a6a31101787..afc3f1405c937d1d6c1928cd4dfec384e6eb8740 100644

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

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

@@ -61,12 +61,6 @@ class SyncSetupFlow {

ProfileSyncService* service,

DictionaryValue* args);

- // Fills |args| for the enter passphrase screen.

- static void GetArgsForEnterPassphrase(

- bool tried_creating_explicit_passphrase,

- bool tried_setting_explicit_passphrase,

- DictionaryValue* args);

void AttachSyncSetupHandler(SyncSetupFlowHandler* handler);

// Triggers a state machine transition to advance_state.

@@ -106,6 +100,7 @@ class SyncSetupFlow {

FRIEND_TEST_ALL_PREFIXES(SyncSetupWizardTest,

DiscreteRunChooseDataTypesAbortedByPendingClear);

FRIEND_TEST_ALL_PREFIXES(SyncSetupWizardTest, EnterPassphraseRequired);

+ FRIEND_TEST_ALL_PREFIXES(SyncSetupWizardTest, NonFatalError);

// Use static Run method to get an instance.

SyncSetupFlow(SyncSetupWizard::State start_state,