| Index: sync/sessions/status_controller.cc
|
| diff --git a/sync/sessions/status_controller.cc b/sync/sessions/status_controller.cc
|
| index 92bef9f4f0616bc31290cddd065d5d609ec40e0e..dcf3fa24af79dcf732a58b1aa78d22fa3d259c44 100644
|
| --- a/sync/sessions/status_controller.cc
|
| +++ b/sync/sessions/status_controller.cc
|
| @@ -143,6 +143,10 @@ void StatusController::set_sync_protocol_error(
|
| model_neutral_.sync_protocol_error = error;
|
| }
|
|
|
| +void StatusController::set_last_get_key_result(const SyncerError result) {
|
| + model_neutral_.last_get_key_result = result;
|
| +}
|
| +
|
| void StatusController::set_last_download_updates_result(
|
| const SyncerError result) {
|
| model_neutral_.last_download_updates_result = result;
|
| @@ -152,6 +156,10 @@ void StatusController::set_commit_result(const SyncerError result) {
|
| model_neutral_.commit_result = result;
|
| }
|
|
|
| +SyncerError StatusController::last_get_key_result() const {
|
| + return model_neutral_.last_get_key_result;
|
| +}
|
| +
|
| void StatusController::update_conflicts_resolved(bool resolved) {
|
| model_neutral_.conflicts_resolved |= resolved;
|
| }
|
|
|