| Index: sync/internal_api/sync_manager_impl.h
|
| diff --git a/sync/internal_api/sync_manager_impl.h b/sync/internal_api/sync_manager_impl.h
|
| index 03d66366c32e9186649df167a121f151241ae6e5..0283065f8a6fde76fa9ccd7c21c58752caca81d0 100644
|
| --- a/sync/internal_api/sync_manager_impl.h
|
| +++ b/sync/internal_api/sync_manager_impl.h
|
| @@ -81,7 +81,8 @@ class SYNC_EXPORT_PRIVATE SyncManagerImpl :
|
| scoped_ptr<UnrecoverableErrorHandler> unrecoverable_error_handler,
|
| ReportUnrecoverableErrorFunction
|
| report_unrecoverable_error_function,
|
| - bool use_oauth2_token) OVERRIDE;
|
| + bool use_oauth2_token,
|
| + CancelationSignal* cancelation_signal) OVERRIDE;
|
| virtual void ThrowUnrecoverableError() OVERRIDE;
|
| virtual ModelTypeSet InitialSyncEndedTypes() OVERRIDE;
|
| virtual ModelTypeSet GetTypesWithEmptyProgressMarkerToken(
|
| @@ -106,7 +107,6 @@ class SYNC_EXPORT_PRIVATE SyncManagerImpl :
|
| virtual void RemoveObserver(SyncManager::Observer* observer) OVERRIDE;
|
| virtual SyncStatus GetDetailedStatus() const OVERRIDE;
|
| virtual void SaveChanges() OVERRIDE;
|
| - virtual void StopSyncingForShutdown() OVERRIDE;
|
| virtual void ShutdownOnSyncThread() OVERRIDE;
|
| virtual UserShare* GetUserShare() OVERRIDE;
|
| virtual const std::string cache_guid() OVERRIDE;
|
|
|