| Index: chrome/browser/sync_file_system/drive_file_sync_service.cc
|
| diff --git a/chrome/browser/sync_file_system/drive_file_sync_service.cc b/chrome/browser/sync_file_system/drive_file_sync_service.cc
|
| index fa49969163c897d8a49f7d2b343360284b340161..71cdb1f2e0b8ab91dd8ddee4eb610e90e9034d64 100644
|
| --- a/chrome/browser/sync_file_system/drive_file_sync_service.cc
|
| +++ b/chrome/browser/sync_file_system/drive_file_sync_service.cc
|
| @@ -359,6 +359,17 @@ LocalChangeProcessor* DriveFileSyncService::GetLocalChangeProcessor() {
|
| return this;
|
| }
|
|
|
| +bool DriveFileSyncService::IsConflicting(const fileapi::FileSystemURL& url) {
|
| + DriveMetadata metadata;
|
| + const fileapi::SyncStatusCode status =
|
| + metadata_store_->ReadEntry(url, &metadata);
|
| + if (status != fileapi::SYNC_STATUS_OK) {
|
| + DCHECK_EQ(fileapi::SYNC_DATABASE_ERROR_NOT_FOUND, status);
|
| + return false;
|
| + }
|
| + return metadata.conflicted();
|
| +}
|
| +
|
| void DriveFileSyncService::GetConflictFiles(
|
| const GURL& origin,
|
| const fileapi::SyncFileSetCallback& callback) {
|
|
|