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

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

Issue 11308340: Remove clearing pending remote/local changes in SyncFileSystemService (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync_file_system/sync_file_system_service.cc
diff --git a/chrome/browser/sync_file_system/sync_file_system_service.cc b/chrome/browser/sync_file_system/sync_file_system_service.cc
index 6b67ef7978b2d2b4680b1cdf6a510f6c4faa93b6..63f17b8e45de5122f4ffe9eb059b85f3027802f5 100644
--- a/chrome/browser/sync_file_system/sync_file_system_service.cc
+++ b/chrome/browser/sync_file_system/sync_file_system_service.cc
@@ -387,10 +387,8 @@ void SyncFileSystemService::DidProcessRemoteChange(
// Notify observers of the changes made for a remote sync.
FOR_EACH_OBSERVER(SyncEventObserver, observers_, OnFileSynced(url, type));
} else if (status == fileapi::SYNC_STATUS_NO_CHANGE_TO_SYNC) {
- // We seem to have no changes to work on. Reset the pending_remote_changes_
- // and return here.
+ // We seem to have no changes to work on for now.
// TODO(kinuko): Might be better setting a timer to call MaybeStartSync.
- pending_remote_changes_ = 0;
return;
} else if (status == fileapi::SYNC_STATUS_FILE_BUSY) {
is_waiting_remote_sync_enabled_ = true;
@@ -414,10 +412,8 @@ void SyncFileSystemService::DidProcessLocalChange(
DCHECK(local_sync_running_);
local_sync_running_ = false;
if (status == fileapi::SYNC_STATUS_NO_CHANGE_TO_SYNC) {
- // We seem to have no changes to work on. Reset the pending_local_changes_
- // and return here.
+ // We seem to have no changes to work on for now.
// TODO(kinuko): Might be better setting a timer to call MaybeStartSync.
- pending_local_changes_ = 0;
return;
} else if (status == fileapi::SYNC_STATUS_HAS_CONFLICT) {
// TODO(kinuko,tzik): Handle conflict!
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698