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

Unified Diff: sync/sessions/sync_session.cc

Issue 11416126: Track merged nudge sources (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More comments Created 8 years, 1 month 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
« sync/protocol/client_debug_info.proto ('K') | « sync/sessions/sync_session.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/sessions/sync_session.cc
diff --git a/sync/sessions/sync_session.cc b/sync/sessions/sync_session.cc
index b57a8eae4ba67927521671bc70b08b5404a65e28..0732329d14b6ebd768836c12160441c3cf626d4e 100644
--- a/sync/sessions/sync_session.cc
+++ b/sync/sessions/sync_session.cc
@@ -80,6 +80,7 @@ SyncSession::SyncSession(SyncSessionContext* context, Delegate* delegate,
enabled_groups_(ComputeEnabledGroups(routing_info_, workers_)) {
status_controller_.reset(new StatusController(routing_info_));
std::sort(workers_.begin(), workers_.end());
+ debug_info_sources_list_.push_back(source_);
}
SyncSession::~SyncSession() {}
@@ -92,6 +93,7 @@ void SyncSession::Coalesce(const SyncSession& session) {
// When we coalesce sessions, the sync update source gets overwritten with the
// most recent, while the type/state map gets merged.
+ debug_info_sources_list_.push_back(session.source_);
CoalesceStates(&source_.types, session.source_.types);
source_.updates_source = session.source_.updates_source;
@@ -177,6 +179,7 @@ SyncSessionSnapshot SyncSession::TakeSnapshot() const {
status_controller_->num_hierarchy_conflicts(),
status_controller_->num_server_conflicts(),
source_,
+ debug_info_sources_list_,
context_->notifications_enabled(),
dir->GetEntriesCount(),
status_controller_->sync_start_time(),
« sync/protocol/client_debug_info.proto ('K') | « sync/sessions/sync_session.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698