| Index: sync/sessions/status_controller.cc
|
| diff --git a/sync/sessions/status_controller.cc b/sync/sessions/status_controller.cc
|
| index 19fdbaff76f18d4b714e8728ca4e4d716086a92c..94aa1efa77e558ef5abe0db6b58aacdb4e41bc39 100644
|
| --- a/sync/sessions/status_controller.cc
|
| +++ b/sync/sessions/status_controller.cc
|
| @@ -142,13 +142,6 @@ void StatusController::set_num_successful_bookmark_commits(int value) {
|
| shared_.syncer_status.mutate()->num_successful_bookmark_commits = value;
|
| }
|
|
|
| -void StatusController::set_unsynced_handles(
|
| - const std::vector<int64>& unsynced_handles) {
|
| - if (!operator==(unsynced_handles, shared_.unsynced_handles.value())) {
|
| - *(shared_.unsynced_handles.mutate()) = unsynced_handles;
|
| - }
|
| -}
|
| -
|
| void StatusController::increment_num_successful_bookmark_commits() {
|
| set_num_successful_bookmark_commits(
|
| shared_.syncer_status.value().num_successful_bookmark_commits + 1);
|
| @@ -180,14 +173,18 @@ void StatusController::set_last_post_commit_result(const SyncerError result) {
|
| shared_.error.mutate()->last_post_commit_result = result;
|
| }
|
|
|
| +const SyncerError StatusController::last_post_commit_result() const {
|
| + return shared_.error.value().last_post_commit_result;
|
| +}
|
| +
|
| void StatusController::set_last_process_commit_response_result(
|
| const SyncerError result) {
|
| shared_.error.mutate()->last_process_commit_response_result = result;
|
| }
|
|
|
| -void StatusController::set_commit_set(const OrderedCommitSet& commit_set) {
|
| - DCHECK(!group_restriction_in_effect_);
|
| - shared_.commit_set = commit_set;
|
| +const SyncerError
|
| +StatusController::last_process_commit_response_result() const {
|
| + return shared_.error.value().last_process_commit_response_result;
|
| }
|
|
|
| void StatusController::update_conflicts_resolved(bool resolved) {
|
| @@ -196,9 +193,6 @@ void StatusController::update_conflicts_resolved(bool resolved) {
|
| void StatusController::reset_conflicts_resolved() {
|
| shared_.control_params.conflicts_resolved = false;
|
| }
|
| -void StatusController::set_items_committed() {
|
| - shared_.control_params.items_committed = true;
|
| -}
|
|
|
| // Returns the number of updates received from the sync server.
|
| int64 StatusController::CountUpdates() const {
|
| @@ -210,12 +204,6 @@ int64 StatusController::CountUpdates() const {
|
| }
|
| }
|
|
|
| -bool StatusController::CurrentCommitIdProjectionHasIndex(size_t index) {
|
| - OrderedCommitSet::Projection proj =
|
| - shared_.commit_set.GetCommitIdProjection(group_restriction_);
|
| - return std::binary_search(proj.begin(), proj.end(), index);
|
| -}
|
| -
|
| bool StatusController::HasConflictingUpdates() const {
|
| DCHECK(!group_restriction_in_effect_)
|
| << "HasConflictingUpdates applies to all ModelSafeGroups";
|
|
|