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

Unified Diff: sync/internal_api/sync_manager_impl.cc

Issue 11314008: sync: Follow-up to conflict resolution refactor (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix tests Created 8 years, 2 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
Index: sync/internal_api/sync_manager_impl.cc
diff --git a/sync/internal_api/sync_manager_impl.cc b/sync/internal_api/sync_manager_impl.cc
index af1f6fa1333e7bda516efb11157e267c69f082b5..eb86bb43bc17e2700d183966bd36a49523ad8c09 100644
--- a/sync/internal_api/sync_manager_impl.cc
+++ b/sync/internal_api/sync_manager_impl.cc
@@ -962,16 +962,11 @@ void SyncManagerImpl::OnSyncEngineEvent(const SyncEngineEvent& event) {
return;
}
- if (!event.snapshot.has_more_to_sync()) {
- DVLOG(1) << "Sending OnSyncCycleCompleted";
- FOR_EACH_OBSERVER(SyncManager::Observer, observers_,
- OnSyncCycleCompleted(event.snapshot));
- }
+ DVLOG(1) << "Sending OnSyncCycleCompleted";
+ FOR_EACH_OBSERVER(SyncManager::Observer, observers_,
+ OnSyncCycleCompleted(event.snapshot));
// This is here for tests, which are still using p2p notifications.
- //
- // TODO(chron): Consider changing this back to track has_more_to_sync
- // only notify peers if a successful commit has occurred.
bool is_notifiable_commit =
(event.snapshot.model_neutral_state().num_successful_commits > 0);
if (is_notifiable_commit) {
« no previous file with comments | « sync/internal_api/public/sessions/sync_source_info_unittest.cc ('k') | sync/protocol/client_debug_info.proto » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698