| 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 adeb56025cc9982645b0a4f12eed6459eecb30c3..da161bc8b3233b432fa3976347eefb10ccf4f9e3 100644
|
| --- a/chrome/browser/sync_file_system/drive_file_sync_service.h
|
| +++ b/chrome/browser/sync_file_system/drive_file_sync_service.h
|
| @@ -69,6 +69,7 @@ class DriveFileSyncService
|
| RemoteChangeProcessor* processor,
|
| const fileapi::SyncOperationCallback& callback) OVERRIDE;
|
| virtual LocalChangeProcessor* GetLocalChangeProcessor() OVERRIDE;
|
| + virtual bool IsConflicting(const fileapi::FileSystemURL& url) OVERRIDE;
|
| virtual void GetConflictFiles(
|
| const GURL& origin,
|
| const fileapi::SyncFileSetCallback& callback) OVERRIDE;
|
|
|