| Index: chrome/browser/sync_file_system/drive_file_sync_service.h
|
| diff --git a/chrome/browser/sync_file_system/drive_file_sync_service.h b/chrome/browser/sync_file_system/drive_file_sync_service.h
|
| index 6bab9baa4f641f53b784c78a81105bb3762062b4..344d361992f829c53139ecf22c7941f44ee74d8a 100644
|
| --- a/chrome/browser/sync_file_system/drive_file_sync_service.h
|
| +++ b/chrome/browser/sync_file_system/drive_file_sync_service.h
|
| @@ -199,18 +199,6 @@ class DriveFileSyncService
|
| LOCAL_SYNC_OPERATION_FAIL,
|
| };
|
|
|
| - enum RemoteSyncOperationType {
|
| - REMOTE_SYNC_OPERATION_ADD_FILE,
|
| - REMOTE_SYNC_OPERATION_UPDATE_FILE,
|
| - REMOTE_SYNC_OPERATION_DELETE_FILE,
|
| - REMOTE_SYNC_OPERATION_NONE,
|
| - REMOTE_SYNC_OPERATION_CONFLICT,
|
| - REMOTE_SYNC_OPERATION_RESOLVE_TO_LOCAL,
|
| - REMOTE_SYNC_OPERATION_RESOLVE_TO_REMOTE,
|
| - REMOTE_SYNC_OPERATION_DELETE_METADATA,
|
| - REMOTE_SYNC_OPERATION_FAIL,
|
| - };
|
| -
|
| typedef base::Callback<void(const base::Time& time,
|
| SyncStatusCode status)> UpdatedTimeCallback;
|
| typedef base::Callback<
|
| @@ -339,11 +327,6 @@ class DriveFileSyncService
|
| SyncStatusCode status,
|
| const SyncFileMetadata& metadata,
|
| const FileChangeList& changes);
|
| - RemoteSyncOperationType ResolveRemoteSyncOperationType(
|
| - const FileChange& remote_file_change,
|
| - ProcessRemoteChangeParam* param,
|
| - const FileChangeList& local_changes,
|
| - bool missing_local_file);
|
| void DidResolveConflictToLocalChange(
|
| scoped_ptr<ProcessRemoteChangeParam> param,
|
| SyncStatusCode status);
|
|
|