OLD | NEW |
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 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
62 virtual void RegisterOriginForTrackingChanges( | 62 virtual void RegisterOriginForTrackingChanges( |
63 const GURL& origin, | 63 const GURL& origin, |
64 const fileapi::SyncStatusCallback& callback) OVERRIDE; | 64 const fileapi::SyncStatusCallback& callback) OVERRIDE; |
65 virtual void UnregisterOriginForTrackingChanges( | 65 virtual void UnregisterOriginForTrackingChanges( |
66 const GURL& origin, | 66 const GURL& origin, |
67 const fileapi::SyncStatusCallback& callback) OVERRIDE; | 67 const fileapi::SyncStatusCallback& callback) OVERRIDE; |
68 virtual void ProcessRemoteChange( | 68 virtual void ProcessRemoteChange( |
69 RemoteChangeProcessor* processor, | 69 RemoteChangeProcessor* processor, |
70 const fileapi::SyncOperationCallback& callback) OVERRIDE; | 70 const fileapi::SyncOperationCallback& callback) OVERRIDE; |
71 virtual LocalChangeProcessor* GetLocalChangeProcessor() OVERRIDE; | 71 virtual LocalChangeProcessor* GetLocalChangeProcessor() OVERRIDE; |
| 72 virtual bool IsConflicting(const fileapi::FileSystemURL& url) OVERRIDE; |
72 virtual void GetConflictFiles( | 73 virtual void GetConflictFiles( |
73 const GURL& origin, | 74 const GURL& origin, |
74 const fileapi::SyncFileSetCallback& callback) OVERRIDE; | 75 const fileapi::SyncFileSetCallback& callback) OVERRIDE; |
75 virtual void GetRemoteFileMetadata( | 76 virtual void GetRemoteFileMetadata( |
76 const fileapi::FileSystemURL& url, | 77 const fileapi::FileSystemURL& url, |
77 const fileapi::SyncFileMetadataCallback& callback) OVERRIDE; | 78 const fileapi::SyncFileMetadataCallback& callback) OVERRIDE; |
78 virtual RemoteServiceState GetCurrentState() const OVERRIDE; | 79 virtual RemoteServiceState GetCurrentState() const OVERRIDE; |
79 | 80 |
80 // LocalChangeProcessor overrides. | 81 // LocalChangeProcessor overrides. |
81 virtual void ApplyLocalChange( | 82 virtual void ApplyLocalChange( |
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
319 // Use WeakPtrFactory instead of SupportsWeakPtr to revoke the weak pointer | 320 // Use WeakPtrFactory instead of SupportsWeakPtr to revoke the weak pointer |
320 // in |token_|. | 321 // in |token_|. |
321 base::WeakPtrFactory<DriveFileSyncService> weak_factory_; | 322 base::WeakPtrFactory<DriveFileSyncService> weak_factory_; |
322 | 323 |
323 DISALLOW_COPY_AND_ASSIGN(DriveFileSyncService); | 324 DISALLOW_COPY_AND_ASSIGN(DriveFileSyncService); |
324 }; | 325 }; |
325 | 326 |
326 } // namespace sync_file_system | 327 } // namespace sync_file_system |
327 | 328 |
328 #endif // CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_FILE_SYNC_SERVICE_H_ | 329 #endif // CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_FILE_SYNC_SERVICE_H_ |
OLD | NEW |