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

Unified Diff: sync/engine/syncer.cc

Issue 19982002: sync: Remove SyncSourceInfo (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Convert SyncShareRecords to typedef Created 7 years, 5 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 | « sync/engine/syncer.h ('k') | sync/engine/syncer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/engine/syncer.cc
diff --git a/sync/engine/syncer.cc b/sync/engine/syncer.cc
index 8005459fb8c478eb324dc2abcc1eba491dc69337..338c287246fc6afaa06d73c902feb7b4bfa7e2bf 100644
--- a/sync/engine/syncer.cc
+++ b/sync/engine/syncer.cc
@@ -73,7 +73,7 @@ bool Syncer::NormalSyncShare(ModelTypeSet request_types,
kCreateMobileBookmarksFolder,
request_types,
base::ConstRef(nudge_tracker)))) {
- return HandleCycleEnd(session);
+ return HandleCycleEnd(session, nudge_tracker.updates_source());
}
}
@@ -81,11 +81,13 @@ bool Syncer::NormalSyncShare(ModelTypeSet request_types,
SyncerError commit_result = BuildAndPostCommits(request_types, this, session);
session->mutable_status_controller()->set_commit_result(commit_result);
- return HandleCycleEnd(session);
+ return HandleCycleEnd(session, nudge_tracker.updates_source());
}
-bool Syncer::ConfigureSyncShare(ModelTypeSet request_types,
- SyncSession* session) {
+bool Syncer::ConfigureSyncShare(
+ ModelTypeSet request_types,
+ sync_pb::GetUpdatesCallerInfo::GetUpdatesSource source,
+ SyncSession* session) {
HandleCycleBegin(session);
VLOG(1) << "Configuring types " << ModelTypeSetToString(request_types);
DownloadAndApplyUpdates(
@@ -93,9 +95,9 @@ bool Syncer::ConfigureSyncShare(ModelTypeSet request_types,
base::Bind(&DownloadUpdatesForConfigure,
session,
kCreateMobileBookmarksFolder,
- session->source(),
+ source,
request_types));
- return HandleCycleEnd(session);
+ return HandleCycleEnd(session, source);
}
bool Syncer::PollSyncShare(ModelTypeSet request_types,
@@ -108,7 +110,7 @@ bool Syncer::PollSyncShare(ModelTypeSet request_types,
session,
kCreateMobileBookmarksFolder,
request_types));
- return HandleCycleEnd(session);
+ return HandleCycleEnd(session, sync_pb::GetUpdatesCallerInfo::PERIODIC);
}
void Syncer::ApplyUpdates(SyncSession* session) {
@@ -149,9 +151,11 @@ void Syncer::HandleCycleBegin(SyncSession* session) {
session->SendEventNotification(SyncEngineEvent::SYNC_CYCLE_BEGIN);
}
-bool Syncer::HandleCycleEnd(SyncSession* session) {
+bool Syncer::HandleCycleEnd(
+ SyncSession* session,
+ sync_pb::GetUpdatesCallerInfo::GetUpdatesSource source) {
if (!ExitRequested()) {
- session->SendEventNotification(SyncEngineEvent::SYNC_CYCLE_ENDED);
+ session->SendSyncCycleEndEventNotification(source);
return true;
} else {
return false;
« no previous file with comments | « sync/engine/syncer.h ('k') | sync/engine/syncer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698