| Index: chrome/browser/sync_file_system/remote_file_sync_service.h
|
| diff --git a/chrome/browser/sync_file_system/remote_file_sync_service.h b/chrome/browser/sync_file_system/remote_file_sync_service.h
|
| index 95b184a6ee2cf0ec92b31a5c16df4431a23040f7..7b2cdede8404cf712af996215a65a4fdaebd94c7 100644
|
| --- a/chrome/browser/sync_file_system/remote_file_sync_service.h
|
| +++ b/chrome/browser/sync_file_system/remote_file_sync_service.h
|
| @@ -108,6 +108,11 @@ class RemoteFileSyncService {
|
| // storage backed by this service.
|
| virtual LocalChangeProcessor* GetLocalChangeProcessor() = 0;
|
|
|
| + // Returns true if the file |url| is marked conflicted in the remote service.
|
| + virtual bool IsConflicting(const fileapi::FileSystemURL& url) = 0;
|
| +
|
| + // TODO(kinuko,tzik): Clean up unused interface methods when we fix
|
| + // the manual conflict resolution API.
|
| // Returns a list of conflicting files for the given origin.
|
| virtual void GetConflictFiles(
|
| const GURL& origin,
|
|
|