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

Unified Diff: sync/sessions/session_state.cc

Issue 10038041: sync: Loop committing items without downloading updates (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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/sessions/session_state.cc
diff --git a/sync/sessions/session_state.cc b/sync/sessions/session_state.cc
index f49c41d00d8b90333aad4c81d000cc5866e3bc90..958f0a49aa74ef897e38b7b2dbdf1bb6c5fd174a 100644
--- a/sync/sessions/session_state.cc
+++ b/sync/sessions/session_state.cc
@@ -109,12 +109,10 @@ SyncSessionSnapshot::SyncSessionSnapshot(
(&download_progress_markers)[syncable::MODEL_TYPE_COUNT],
bool more_to_sync,
bool is_silenced,
- int64 unsynced_count,
int num_encryption_conflicts,
int num_hierarchy_conflicts,
int num_simple_conflicts,
int num_server_conflicts,
- bool did_commit_items,
const SyncSourceInfo& source,
bool notifications_enabled,
size_t num_entries,
@@ -128,12 +126,10 @@ SyncSessionSnapshot::SyncSessionSnapshot(
download_progress_markers(),
has_more_to_sync(more_to_sync),
is_silenced(is_silenced),
- unsynced_count(unsynced_count),
num_encryption_conflicts(num_encryption_conflicts),
num_hierarchy_conflicts(num_hierarchy_conflicts),
num_simple_conflicts(num_simple_conflicts),
num_server_conflicts(num_server_conflicts),
- did_commit_items(did_commit_items),
source(source),
notifications_enabled(notifications_enabled),
num_entries(num_entries),
@@ -162,8 +158,6 @@ DictionaryValue* SyncSessionSnapshot::ToValue() const {
value->SetBoolean("hasMoreToSync", has_more_to_sync);
value->SetBoolean("isSilenced", is_silenced);
// We don't care too much if we lose precision here, also.
- value->SetInteger("unsyncedCount",
- static_cast<int>(unsynced_count));
value->SetInteger("numEncryptionConflicts",
num_encryption_conflicts);
value->SetInteger("numHierarchyConflicts",
@@ -172,7 +166,6 @@ DictionaryValue* SyncSessionSnapshot::ToValue() const {
num_simple_conflicts);
value->SetInteger("numServerConflicts",
num_server_conflicts);
- value->SetBoolean("didCommitItems", did_commit_items);
value->SetInteger("numEntries", num_entries);
value->Set("source", source.ToValue());
value->SetBoolean("notificationsEnabled", notifications_enabled);
@@ -312,11 +305,9 @@ bool UpdateProgress::HasConflictingUpdates() const {
}
AllModelTypeState::AllModelTypeState(bool* dirty_flag)
- : unsynced_handles(dirty_flag),
- syncer_status(dirty_flag),
+ : syncer_status(dirty_flag),
error(dirty_flag),
- num_server_changes_remaining(dirty_flag, 0),
- commit_set(ModelSafeRoutingInfo()) {
+ num_server_changes_remaining(dirty_flag, 0) {
}
AllModelTypeState::~AllModelTypeState() {}

Powered by Google App Engine
This is Rietveld 408576698