diff options
| author | rlarocque@chromium.org <rlarocque@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-08 23:25:22 +0000 |
|---|---|---|
| committer | rlarocque@chromium.org <rlarocque@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-08 23:25:22 +0000 |
| commit | 42fff674909f23a7ad89318444884c64b1b67182 (patch) | |
| tree | f709e6578ad6a8a9e451b5f0a922d946d6129439 /sync/engine/syncer.cc | |
| parent | 531e63525c32fc235daed199db1dcec02c0629ad (diff) | |
| download | chromium_src-42fff674909f23a7ad89318444884c64b1b67182.zip chromium_src-42fff674909f23a7ad89318444884c64b1b67182.tar.gz chromium_src-42fff674909f23a7ad89318444884c64b1b67182.tar.bz2 | |
Refactor following sync commit loop change
This change includes some cleanups of the code introduced in r139519.
They have been kept separate from that CL in the hopes of making both
CLs easiser to read.
This commit moves some error-detection functionality from
ProcessCommitResponse's ModelNeutralExecuteImpl() into
BuildAndPostCommits(). This simplifies some of the error handling and
allows us to remove ModelChangingSyncerCommand's
ModelNeutralExecuteImpl().
This CL also combines both commit error indicators into a single
variable.
BUG=91696,36594
TEST=
Review URL: https://chromiumcodereview.appspot.com/10523003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141321 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/engine/syncer.cc')
| -rw-r--r-- | sync/engine/syncer.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sync/engine/syncer.cc b/sync/engine/syncer.cc index f8639c0..1a299db 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; } |