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

Side by Side 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: 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_FILE_SYNC_SERVICE_H_ 5 #ifndef CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_FILE_SYNC_SERVICE_H_
6 #define CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_FILE_SYNC_SERVICE_H_ 6 #define CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_FILE_SYNC_SERVICE_H_
7 7
8 #include <deque> 8 #include <deque>
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 LOCAL_SYNC_OPERATION_DELETE, 197 LOCAL_SYNC_OPERATION_DELETE,
198 LOCAL_SYNC_OPERATION_NONE, 198 LOCAL_SYNC_OPERATION_NONE,
199 LOCAL_SYNC_OPERATION_NONE_CONFLICTED, 199 LOCAL_SYNC_OPERATION_NONE_CONFLICTED,
200 LOCAL_SYNC_OPERATION_CONFLICT, 200 LOCAL_SYNC_OPERATION_CONFLICT,
201 LOCAL_SYNC_OPERATION_RESOLVE_TO_REMOTE, 201 LOCAL_SYNC_OPERATION_RESOLVE_TO_REMOTE,
202 LOCAL_SYNC_OPERATION_FAIL, 202 LOCAL_SYNC_OPERATION_FAIL,
203 }; 203 };
204 204
205 enum RemoteSyncOperationType { 205 enum RemoteSyncOperationType {
206 REMOTE_SYNC_OPERATION_ADD_FILE, 206 REMOTE_SYNC_OPERATION_ADD_FILE,
207 REMOTE_SYNC_OPERATION_ADD_DIRECTORY,
207 REMOTE_SYNC_OPERATION_UPDATE_FILE, 208 REMOTE_SYNC_OPERATION_UPDATE_FILE,
208 REMOTE_SYNC_OPERATION_DELETE_FILE, 209 REMOTE_SYNC_OPERATION_DELETE_FILE,
210 REMOTE_SYNC_OPERATION_DELETE_DIRECTORY,
209 REMOTE_SYNC_OPERATION_NONE, 211 REMOTE_SYNC_OPERATION_NONE,
210 REMOTE_SYNC_OPERATION_CONFLICT, 212 REMOTE_SYNC_OPERATION_CONFLICT,
211 REMOTE_SYNC_OPERATION_RESOLVE_TO_LOCAL, 213 REMOTE_SYNC_OPERATION_RESOLVE_TO_LOCAL,
212 REMOTE_SYNC_OPERATION_RESOLVE_TO_REMOTE, 214 REMOTE_SYNC_OPERATION_RESOLVE_TO_REMOTE,
213 REMOTE_SYNC_OPERATION_DELETE_METADATA, 215 REMOTE_SYNC_OPERATION_DELETE_METADATA,
214 REMOTE_SYNC_OPERATION_FAIL, 216 REMOTE_SYNC_OPERATION_FAIL,
215 }; 217 };
216 218
217 typedef base::Callback<void(const base::Time& time, 219 typedef base::Callback<void(const base::Time& time,
218 SyncStatusCode status)> UpdatedTimeCallback; 220 SyncStatusCode status)> UpdatedTimeCallback;
(...skipping 318 matching lines...) Expand 10 before | Expand all | Expand 10 after
537 // Use WeakPtrFactory instead of SupportsWeakPtr to revoke the weak pointer 539 // Use WeakPtrFactory instead of SupportsWeakPtr to revoke the weak pointer
538 // in |token_|. 540 // in |token_|.
539 base::WeakPtrFactory<DriveFileSyncService> weak_factory_; 541 base::WeakPtrFactory<DriveFileSyncService> weak_factory_;
540 542
541 DISALLOW_COPY_AND_ASSIGN(DriveFileSyncService); 543 DISALLOW_COPY_AND_ASSIGN(DriveFileSyncService);
542 }; 544 };
543 545
544 } // namespace sync_file_system 546 } // namespace sync_file_system
545 547
546 #endif // CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_FILE_SYNC_SERVICE_H_ 548 #endif // CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_FILE_SYNC_SERVICE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698