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 #include "chrome/browser/sync_file_system/drive_file_sync_service.h" | 5 #include "chrome/browser/sync_file_system/drive_file_sync_service.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 341 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
352 processor->PrepareForProcessRemoteChange( | 352 processor->PrepareForProcessRemoteChange( |
353 remote_change.url, | 353 remote_change.url, |
354 base::Bind(&DriveFileSyncService::DidPrepareForProcessRemoteChange, | 354 base::Bind(&DriveFileSyncService::DidPrepareForProcessRemoteChange, |
355 AsWeakPtr(), base::Passed(¶m))); | 355 AsWeakPtr(), base::Passed(¶m))); |
356 } | 356 } |
357 | 357 |
358 LocalChangeProcessor* DriveFileSyncService::GetLocalChangeProcessor() { | 358 LocalChangeProcessor* DriveFileSyncService::GetLocalChangeProcessor() { |
359 return this; | 359 return this; |
360 } | 360 } |
361 | 361 |
| 362 bool DriveFileSyncService::IsConflicting(const fileapi::FileSystemURL& url) { |
| 363 DriveMetadata metadata; |
| 364 const fileapi::SyncStatusCode status = |
| 365 metadata_store_->ReadEntry(url, &metadata); |
| 366 if (status != fileapi::SYNC_STATUS_OK) { |
| 367 DCHECK_EQ(fileapi::SYNC_DATABASE_ERROR_NOT_FOUND, status); |
| 368 return false; |
| 369 } |
| 370 return metadata.conflicted(); |
| 371 } |
| 372 |
362 void DriveFileSyncService::GetConflictFiles( | 373 void DriveFileSyncService::GetConflictFiles( |
363 const GURL& origin, | 374 const GURL& origin, |
364 const fileapi::SyncFileSetCallback& callback) { | 375 const fileapi::SyncFileSetCallback& callback) { |
365 NOTIMPLEMENTED(); | 376 NOTIMPLEMENTED(); |
366 callback.Run(fileapi::SYNC_STATUS_FAILED, | 377 callback.Run(fileapi::SYNC_STATUS_FAILED, |
367 fileapi::FileSystemURLSet()); | 378 fileapi::FileSystemURLSet()); |
368 } | 379 } |
369 | 380 |
370 void DriveFileSyncService::GetRemoteFileMetadata( | 381 void DriveFileSyncService::GetRemoteFileMetadata( |
371 const fileapi::FileSystemURL& url, | 382 const fileapi::FileSystemURL& url, |
(...skipping 957 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1329 fileapi::SyncStatusCode | 1340 fileapi::SyncStatusCode |
1330 DriveFileSyncService::GDataErrorCodeToSyncStatusCodeWrapper( | 1341 DriveFileSyncService::GDataErrorCodeToSyncStatusCodeWrapper( |
1331 google_apis::GDataErrorCode error) const { | 1342 google_apis::GDataErrorCode error) const { |
1332 fileapi::SyncStatusCode status = GDataErrorCodeToSyncStatusCode(error); | 1343 fileapi::SyncStatusCode status = GDataErrorCodeToSyncStatusCode(error); |
1333 if (status != fileapi::SYNC_STATUS_OK && !sync_client_->IsAuthenticated()) | 1344 if (status != fileapi::SYNC_STATUS_OK && !sync_client_->IsAuthenticated()) |
1334 return fileapi::SYNC_STATUS_AUTHENTICATION_FAILED; | 1345 return fileapi::SYNC_STATUS_AUTHENTICATION_FAILED; |
1335 return status; | 1346 return status; |
1336 } | 1347 } |
1337 | 1348 |
1338 } // namespace sync_file_system | 1349 } // namespace sync_file_system |
OLD | NEW |