Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(42)

Unified Diff: chrome/browser/sync_file_system/drive_file_sync_service.h

Issue 13986011: SyncFS: Introduce RemoteSyncOperationResolver for directory operation support (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review fix Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/sync_file_system/drive_file_sync_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
« no previous file with comments | « no previous file | chrome/browser/sync_file_system/drive_file_sync_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698