| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/sync/sessions/status_controller.h" | 5 #include "chrome/browser/sync/sessions/status_controller.h" |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
| 10 #include "chrome/browser/sync/protocol/sync_protocol_error.h" | 10 #include "chrome/browser/sync/protocol/sync_protocol_error.h" |
| (...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 218 void StatusController::set_last_process_commit_response_result( | 218 void StatusController::set_last_process_commit_response_result( |
| 219 const SyncerError result) { | 219 const SyncerError result) { |
| 220 shared_.error.mutate()->last_process_commit_response_result = result; | 220 shared_.error.mutate()->last_process_commit_response_result = result; |
| 221 } | 221 } |
| 222 | 222 |
| 223 void StatusController::set_commit_set(const OrderedCommitSet& commit_set) { | 223 void StatusController::set_commit_set(const OrderedCommitSet& commit_set) { |
| 224 DCHECK(!group_restriction_in_effect_); | 224 DCHECK(!group_restriction_in_effect_); |
| 225 shared_.commit_set = commit_set; | 225 shared_.commit_set = commit_set; |
| 226 } | 226 } |
| 227 | 227 |
| 228 void StatusController::update_conflict_sets_built(bool built) { | |
| 229 shared_.control_params.conflict_sets_built |= built; | |
| 230 } | |
| 231 void StatusController::update_conflicts_resolved(bool resolved) { | 228 void StatusController::update_conflicts_resolved(bool resolved) { |
| 232 shared_.control_params.conflicts_resolved |= resolved; | 229 shared_.control_params.conflicts_resolved |= resolved; |
| 233 } | 230 } |
| 234 void StatusController::reset_conflicts_resolved() { | 231 void StatusController::reset_conflicts_resolved() { |
| 235 shared_.control_params.conflicts_resolved = false; | 232 shared_.control_params.conflicts_resolved = false; |
| 236 } | 233 } |
| 237 void StatusController::set_items_committed() { | 234 void StatusController::set_items_committed() { |
| 238 shared_.control_params.items_committed = true; | 235 shared_.control_params.items_committed = true; |
| 239 } | 236 } |
| 240 | 237 |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 307 void StatusController::set_debug_info_sent() { | 304 void StatusController::set_debug_info_sent() { |
| 308 shared_.control_params.debug_info_sent = true; | 305 shared_.control_params.debug_info_sent = true; |
| 309 } | 306 } |
| 310 | 307 |
| 311 bool StatusController::debug_info_sent() const { | 308 bool StatusController::debug_info_sent() const { |
| 312 return shared_.control_params.debug_info_sent; | 309 return shared_.control_params.debug_info_sent; |
| 313 } | 310 } |
| 314 | 311 |
| 315 } // namespace sessions | 312 } // namespace sessions |
| 316 } // namespace browser_sync | 313 } // namespace browser_sync |
| OLD | NEW |