| Index: chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.h
|
| diff --git a/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.h b/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.h
|
| index 5acb5410bd38db1059ae5a7bf8f4c28dbfb7a9f7..ef9c9e73045068c35d9870f3d2cee2a282bdb6ae 100644
|
| --- a/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.h
|
| +++ b/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.h
|
| @@ -84,13 +84,13 @@ class LocalToRemoteSyncer : public SyncTask {
|
| google_apis::GDataErrorCode error,
|
| scoped_ptr<google_apis::FileResource> entry);
|
|
|
| - void DidDeleteForUploadNewFile(const SyncStatusCallback& callback,
|
| + void DidDeleteForUploadNewFile(scoped_ptr<SyncTaskToken> token,
|
| SyncStatusCode status);
|
| void DidDeleteForCreateFolder(scoped_ptr<SyncTaskToken> token,
|
| SyncStatusCode status);
|
|
|
| - void UploadNewFile(const SyncStatusCallback& callback);
|
| - void DidUploadNewFile(const SyncStatusCallback& callback,
|
| + void UploadNewFile(scoped_ptr<SyncTaskToken> token);
|
| + void DidUploadNewFile(scoped_ptr<SyncTaskToken> token,
|
| google_apis::GDataErrorCode error,
|
| const GURL& upload_location,
|
| scoped_ptr<google_apis::FileResource> entry);
|
| @@ -99,7 +99,7 @@ class LocalToRemoteSyncer : public SyncTask {
|
| void DidCreateRemoteFolder(scoped_ptr<SyncTaskToken> token,
|
| const std::string& file_id,
|
| SyncStatusCode status);
|
| - void DidDetachResourceForCreationConflict(const SyncStatusCallback& callback,
|
| + void DidDetachResourceForCreationConflict(scoped_ptr<SyncTaskToken> token,
|
| google_apis::GDataErrorCode error);
|
|
|
| bool IsContextReady();
|
|
|