| Index: chrome/browser/sync/profile_sync_service.h
|
| diff --git a/chrome/browser/sync/profile_sync_service.h b/chrome/browser/sync/profile_sync_service.h
|
| index a8066bf49cdd36267409762b637c1c9faeb15fae..c16537e95289f906ec19a50153ca876407845b62 100644
|
| --- a/chrome/browser/sync/profile_sync_service.h
|
| +++ b/chrome/browser/sync/profile_sync_service.h
|
| @@ -478,9 +478,19 @@ class ProfileSyncService : public ProfileSyncServiceBase,
|
| // is complete). The UI calls this as soon as any part of the signin wizard is
|
| // displayed (even just the login UI).
|
| // If |setup_in_progress| is false, this also kicks the sync engine to ensure
|
| - // that data download starts.
|
| + // that data download starts. In this case, |ReconfigureDatatypeManager| will
|
| + // get triggered.
|
| virtual void SetSetupInProgress(bool setup_in_progress);
|
|
|
| + // Reconfigures the data type manager with the latest enabled types.
|
| + // Note: Does not initialize the backend if it is not already initialized.
|
| + // This function needs to be called only after sync has been initialized
|
| + // (i.e.,only for reconfigurations). The reason we don't initialize the
|
| + // backend is because if we had encountered an unrecoverable error we don't
|
| + // want to startup once more.
|
| + // This function is called by |SetSetupInProgress|.
|
| + virtual void ReconfigureDatatypeManager();
|
| +
|
| // Returns true if the SyncBackendHost has told us it's ready to accept
|
| // changes.
|
| // [REMARK] - it is safe to call this function only from the ui thread.
|
| @@ -911,14 +921,6 @@ class ProfileSyncService : public ProfileSyncServiceBase,
|
| // Create and register a new datatype controller.
|
| void RegisterNewDataType(syncer::ModelType data_type);
|
|
|
| - // Reconfigures the data type manager with the latest enabled types.
|
| - // Note: Does not initialize the backend if it is not already initialized.
|
| - // This function needs to be called only after sync has been initialized
|
| - // (i.e.,only for reconfigurations). The reason we don't initialize the
|
| - // backend is because if we had encountered an unrecoverable error we don't
|
| - // want to startup once more.
|
| - virtual void ReconfigureDatatypeManager();
|
| -
|
| // Collects preferred sync data types from |preference_providers_|.
|
| syncer::ModelTypeSet GetDataTypesFromPreferenceProviders() const;
|
|
|
|
|