| Index: sync/internal_api/sync_manager.h
|
| diff --git a/sync/internal_api/sync_manager.h b/sync/internal_api/sync_manager.h
|
| index 6076ab7a5baafae04e4a342bc0ff23bfc43fd07e..3db7df10e73fbcee69d42f7a75f6b1aae0e99c27 100644
|
| --- a/sync/internal_api/sync_manager.h
|
| +++ b/sync/internal_api/sync_manager.h
|
| @@ -365,9 +365,13 @@ class SyncManager {
|
| */
|
| // function getChildNodeIds(id);
|
|
|
| + // Informs observers that the SyncManager initialization is complete.
|
| + // Returns a boolean indicating whether or not the initialization was
|
| + // successful and a list of the types for which data was found in the
|
| + // local store.
|
| virtual void OnInitializationComplete(
|
| - const browser_sync::WeakHandle<browser_sync::JsBackend>&
|
| - js_backend, bool success) = 0;
|
| + const browser_sync::WeakHandle<browser_sync::JsBackend>& js_backend,
|
| + bool success, syncable::ModelTypeSet restored_types) = 0;
|
|
|
| // We are no longer permitted to communicate with the server. Sync should
|
| // be disabled and state cleaned up at once. This can happen for a number
|
| @@ -447,7 +451,6 @@ class SyncManager {
|
| bool use_ssl,
|
| const scoped_refptr<base::TaskRunner>& blocking_task_runner,
|
| HttpPostProviderFactory* post_factory,
|
| - const browser_sync::ModelSafeRoutingInfo& model_safe_routing_info,
|
| const std::vector<browser_sync::ModelSafeWorker*>& workers,
|
| browser_sync::ExtensionsActivityMonitor*
|
| extensions_activity_monitor,
|
| @@ -624,10 +627,6 @@ class SyncManager {
|
|
|
| bool InitialSyncEndedForTypes(syncable::ModelTypeSet types, UserShare* share);
|
|
|
| -syncable::ModelTypeSet GetTypesWithEmptyProgressMarkerToken(
|
| - syncable::ModelTypeSet types,
|
| - sync_api::UserShare* share);
|
| -
|
| const char* ConnectionStatusToString(ConnectionStatus status);
|
|
|
| // Returns the string representation of a PassphraseRequiredReason value.
|
|
|