| 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 b7dfe24cc301bffcc69cc855931234d6c7f756bc..dcc7fe7dc2e954e8350303e314aa56968bd58210 100644
|
| --- a/chrome/browser/sync/sync_setup_flow.h
|
| +++ b/chrome/browser/sync/sync_setup_flow.h
|
| @@ -47,6 +47,11 @@ class SyncSetupFlow : public HtmlDialogUIDelegate {
|
| const ProfileSyncService* service,
|
| DictionaryValue* args);
|
|
|
| + // Fills |args| with "user" and "error" arguments by querying |service|.
|
| + static void GetArgsForChooseDataTypes(
|
| + ProfileSyncService* service,
|
| + DictionaryValue* args);
|
| +
|
| // Triggers a state machine transition to advance_state.
|
| void Advance(SyncSetupWizard::State advance_state);
|
|
|
| @@ -127,8 +132,14 @@ class SyncSetupFlow : public HtmlDialogUIDelegate {
|
| service_->OnUserSubmittedAuth(username, password, captcha);
|
| }
|
|
|
| + void OnUserChoseDataTypes(bool sync_everything,
|
| + syncable::ModelTypeSet& chosen_types) {
|
| + service_->OnUserChoseDatatypes(sync_everything, chosen_types);
|
| + }
|
| +
|
| private:
|
| FRIEND_TEST_ALL_PREFIXES(SyncSetupWizardTest, InitialStepLogin);
|
| + FRIEND_TEST_ALL_PREFIXES(SyncSetupWizardTest, ChooseDataTypesSetsPrefs);
|
| FRIEND_TEST_ALL_PREFIXES(SyncSetupWizardTest, InitialStepMergeAndSync);
|
| FRIEND_TEST_ALL_PREFIXES(SyncSetupWizardTest, DialogCancelled);
|
| FRIEND_TEST_ALL_PREFIXES(SyncSetupWizardTest, InvalidTransitions);
|
| @@ -204,12 +215,14 @@ class FlowHandler : public DOMMessageHandler {
|
| void ClickCustomizeOk(const Value* value);
|
| void ClickCustomizeCancel(const Value* value);
|
| void HandleSubmitAuth(const Value* value);
|
| + void HandleChooseDataTypes(const Value* value);
|
| void HandleSubmitMergeAndSync(const Value* value);
|
|
|
| // These functions control which part of the HTML is visible.
|
| void ShowGaiaLogin(const DictionaryValue& args);
|
| void ShowGaiaSuccessAndClose();
|
| void ShowGaiaSuccessAndSettingUp();
|
| + void ShowChooseDataTypes(const DictionaryValue& args);
|
| void ShowSetupDone(const std::wstring& user);
|
| void ShowFirstTimeDone(const std::wstring& user);
|
|
|
|
|