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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: sync/engine/syncer.cc

Issue 10523003: Refactor following sync commit loop change (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Alternate SYNCING bits clear Created 8 years, 6 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
« sync/engine/commit.cc ('K') | « sync/engine/process_commit_response_command.cc ('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 ac6b5eb787e354f94b2d5daab3f6ae9c1b631088..69461b83942ab1866600501cdc1479c4c0c47457 100644
--- a/sync/engine/syncer.cc
+++ b/sync/engine/syncer.cc
@@ -182,7 +182,8 @@ void Syncer::SyncShare(sessions::SyncSession* session,
break;
}
case COMMIT: {
- BuildAndPostCommits(this, session);
+ session->mutable_status_controller()->set_commit_result(
+ BuildAndPostCommits(this, session));
next_step = RESOLVE_CONFLICTS;
break;
}
« sync/engine/commit.cc ('K') | « sync/engine/process_commit_response_command.cc ('k') | sync/engine/syncer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698