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/sessions/status_controller.h | |
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/sessions/status_controller.h')
-rw-r--r-- | sync/sessions/status_controller.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sync/sessions/status_controller.h b/sync/sessions/status_controller.h index d91efec..ebb77ba 100644 --- a/sync/sessions/status_controller.h +++ b/sync/sessions/status_controller.h @@ -157,9 +157,6 @@ class StatusController { return ActiveGroupRestrictionIncludesModel(syncable::BOOKMARKS); } - SyncerError last_post_commit_result() const; - SyncerError last_process_commit_response_result() const; - // A toolbelt full of methods for updating counters and flags. void set_num_server_changes_remaining(int64 changes_remaining); void set_invalid_store(bool invalid_store); @@ -174,8 +171,7 @@ class StatusController { void increment_num_server_overwrites(); void set_sync_protocol_error(const SyncProtocolError& error); void set_last_download_updates_result(const SyncerError result); - void set_last_post_commit_result(const SyncerError result); - void set_last_process_commit_response_result(const SyncerError result); + void set_commit_result(const SyncerError result); void update_conflicts_resolved(bool resolved); void reset_conflicts_resolved(); |