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

Unified Diff: chrome/browser/sync_file_system/drive_backend/list_changes_task.cc

Issue 98043004: [SyncFS] Run ConflictResolver only when it is needed. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix test expectation Created 7 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_backend/list_changes_task.cc
diff --git a/chrome/browser/sync_file_system/drive_backend/list_changes_task.cc b/chrome/browser/sync_file_system/drive_backend/list_changes_task.cc
index 886db8c77e0f0829c6c15ba8c5147d09419760b6..9a35a93cb345eafeae1f6223cba3351d0b7f77ff 100644
--- a/chrome/browser/sync_file_system/drive_backend/list_changes_task.cc
+++ b/chrome/browser/sync_file_system/drive_backend/list_changes_task.cc
@@ -86,6 +86,11 @@ void ListChangesTask::DidListChanges(
return;
}
+ if (change_list_.empty()) {
+ callback.Run(SYNC_STATUS_NO_CHANGE_TO_SYNC);
+ return;
+ }
+
metadata_database()->UpdateByChangeList(
resource_list->largest_changestamp(),
change_list_.Pass(), callback);

Powered by Google App Engine
This is Rietveld 408576698