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

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

Issue 453673003: [SyncFS] Promote demoted changes in default remote side backend (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix test expectation Created 6 years, 4 months 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 | chrome/browser/sync_file_system/sync_file_system_service_unittest.cc » ('j') | 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 b9a6214aeb8f3dec9281cb493335df7e578fa4bc..f7510bed4ae30a5ded8f5a0981624bbd1890d64b 100644
--- a/chrome/browser/sync_file_system/sync_file_system_service.cc
+++ b/chrome/browser/sync_file_system/sync_file_system_service.cc
@@ -368,8 +368,11 @@ void SyncFileSystemService::OnSyncIdle() {
local_sync_runners_.begin();
iter != local_sync_runners_.end(); ++iter)
local_changes += (*iter)->pending_changes();
- if (local_changes == 0 && v2_remote_service_)
- v2_remote_service_->PromoteDemotedChanges(NoopClosure());
+ if (local_changes == 0) {
+ remote_service_->PromoteDemotedChanges(NoopClosure());
+ if (v2_remote_service_)
+ v2_remote_service_->PromoteDemotedChanges(NoopClosure());
+ }
}
SyncServiceState SyncFileSystemService::GetSyncServiceState() {
« no previous file with comments | « no previous file | chrome/browser/sync_file_system/sync_file_system_service_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698