Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(37)

Unified Diff: chrome/browser/sync_file_system/drive_file_sync_service.cc

Issue 11421197: Implement SyncFileSystemService::GetFileSyncStatus method (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: indent fix Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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) {
« no previous file with comments | « chrome/browser/sync_file_system/drive_file_sync_service.h ('k') | chrome/browser/sync_file_system/local_file_sync_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698