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

Unified Diff: sync/internal_api/sync_manager.cc

Issue 10197004: [Sync] Convert SyncSessionSnapshot to a copy-able class. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: lint Created 8 years, 8 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.cc
diff --git a/sync/internal_api/sync_manager.cc b/sync/internal_api/sync_manager.cc
index ebe870e60e81f218b20e5a32d00fc5cfa38972a8..d7d8c8afdde2054bd3d35c92edb6bf635fe75805 100644
--- a/sync/internal_api/sync_manager.cc
+++ b/sync/internal_api/sync_manager.cc
@@ -2070,7 +2070,7 @@ void SyncManager::SyncInternal::OnSyncEngineEvent(
OnPassphraseRequired(sync_api::REASON_DECRYPTION,
pending_keys));
} else if (!cryptographer->is_ready() &&
- event.snapshot->initial_sync_ended.Has(syncable::NIGORI)) {
+ event.snapshot.initial_sync_ended().Has(syncable::NIGORI)) {
DVLOG(1) << "OnPassphraseRequired sent because cryptographer is not "
<< "ready";
FOR_EACH_OBSERVER(SyncManager::Observer, observers_,
@@ -2088,7 +2088,7 @@ void SyncManager::SyncInternal::OnSyncEngineEvent(
return;
}
- if (!event.snapshot->has_more_to_sync) {
+ if (!event.snapshot.has_more_to_sync()) {
// To account for a nigori node arriving with stale/bad data, we ensure
// that the nigori node is up to date at the end of each cycle.
WriteTransaction trans(FROM_HERE, GetUserShare());
@@ -2109,12 +2109,12 @@ void SyncManager::SyncInternal::OnSyncEngineEvent(
// 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->syncer_status.num_successful_commits > 0);
+ (event.snapshot.syncer_status().num_successful_commits > 0);
if (is_notifiable_commit) {
if (sync_notifier_.get()) {
const ModelTypeSet changed_types =
syncable::ModelTypePayloadMapToEnumSet(
- event.snapshot->source.types);
+ event.snapshot.source().types);
sync_notifier_->SendNotification(changed_types);
} else {
DVLOG(1) << "Not sending notification: sync_notifier_ is NULL";
@@ -2149,7 +2149,7 @@ void SyncManager::SyncInternal::OnSyncEngineEvent(
if (event.what_happened == SyncEngineEvent::ACTIONABLE_ERROR) {
FOR_EACH_OBSERVER(SyncManager::Observer, observers_,
OnActionableError(
- event.snapshot->errors.sync_protocol_error));
+ event.snapshot.errors().sync_protocol_error));
return;
}

Powered by Google App Engine
This is Rietveld 408576698