| 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 "sync/sessions/status_controller.h" | 5 #include "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 "sync/internal_api/public/base/model_type.h" | 10 #include "sync/internal_api/public/base/model_type.h" |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 74 } | 74 } |
| 75 | 75 |
| 76 void StatusController::increment_num_local_overwrites() { | 76 void StatusController::increment_num_local_overwrites() { |
| 77 model_neutral_.num_local_overwrites++; | 77 model_neutral_.num_local_overwrites++; |
| 78 } | 78 } |
| 79 | 79 |
| 80 void StatusController::increment_num_server_overwrites() { | 80 void StatusController::increment_num_server_overwrites() { |
| 81 model_neutral_.num_server_overwrites++; | 81 model_neutral_.num_server_overwrites++; |
| 82 } | 82 } |
| 83 | 83 |
| 84 void StatusController::set_sync_protocol_error( | |
| 85 const SyncProtocolError& error) { | |
| 86 model_neutral_.sync_protocol_error = error; | |
| 87 } | |
| 88 | |
| 89 void StatusController::set_last_get_key_result(const SyncerError result) { | 84 void StatusController::set_last_get_key_result(const SyncerError result) { |
| 90 model_neutral_.last_get_key_result = result; | 85 model_neutral_.last_get_key_result = result; |
| 91 } | 86 } |
| 92 | 87 |
| 93 void StatusController::set_last_download_updates_result( | 88 void StatusController::set_last_download_updates_result( |
| 94 const SyncerError result) { | 89 const SyncerError result) { |
| 95 model_neutral_.last_download_updates_result = result; | 90 model_neutral_.last_download_updates_result = result; |
| 96 } | 91 } |
| 97 | 92 |
| 98 void StatusController::set_commit_result(const SyncerError result) { | 93 void StatusController::set_commit_result(const SyncerError result) { |
| (...skipping 27 matching lines...) Expand all Loading... |
| 126 int StatusController::TotalNumConflictingItems() const { | 121 int StatusController::TotalNumConflictingItems() const { |
| 127 int sum = 0; | 122 int sum = 0; |
| 128 sum += num_encryption_conflicts(); | 123 sum += num_encryption_conflicts(); |
| 129 sum += num_hierarchy_conflicts(); | 124 sum += num_hierarchy_conflicts(); |
| 130 sum += num_server_conflicts(); | 125 sum += num_server_conflicts(); |
| 131 return sum; | 126 return sum; |
| 132 } | 127 } |
| 133 | 128 |
| 134 } // namespace sessions | 129 } // namespace sessions |
| 135 } // namespace syncer | 130 } // namespace syncer |
| OLD | NEW |