| Index: trunk/src/sync/internal_api/sync_manager_impl.h
|
| ===================================================================
|
| --- trunk/src/sync/internal_api/sync_manager_impl.h (revision 222204)
|
| +++ trunk/src/sync/internal_api/sync_manager_impl.h (working copy)
|
| @@ -81,8 +81,7 @@
|
| scoped_ptr<UnrecoverableErrorHandler> unrecoverable_error_handler,
|
| ReportUnrecoverableErrorFunction
|
| report_unrecoverable_error_function,
|
| - bool use_oauth2_token,
|
| - CancelationSignal* cancelation_signal) OVERRIDE;
|
| + bool use_oauth2_token) OVERRIDE;
|
| virtual void ThrowUnrecoverableError() OVERRIDE;
|
| virtual ModelTypeSet InitialSyncEndedTypes() OVERRIDE;
|
| virtual ModelTypeSet GetTypesWithEmptyProgressMarkerToken(
|
| @@ -107,6 +106,7 @@
|
| 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;
|
|
|