| 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 "components/sync/sessions_impl/status_controller.h" | 5 #include "components/sync/engine_impl/cycle/status_controller.h" |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "components/sync/base/model_type.h" | 9 #include "components/sync/base/model_type.h" |
| 10 #include "components/sync/protocol/sync_protocol_error.h" | 10 #include "components/sync/protocol/sync_protocol_error.h" |
| 11 | 11 |
| 12 namespace syncer { | 12 namespace syncer { |
| 13 namespace sessions { | |
| 14 | 13 |
| 15 StatusController::StatusController() {} | 14 StatusController::StatusController() {} |
| 16 | 15 |
| 17 StatusController::~StatusController() {} | 16 StatusController::~StatusController() {} |
| 18 | 17 |
| 19 const ModelTypeSet StatusController::get_updates_request_types() const { | 18 const ModelTypeSet StatusController::get_updates_request_types() const { |
| 20 return model_neutral_.get_updates_request_types; | 19 return model_neutral_.get_updates_request_types; |
| 21 } | 20 } |
| 22 | 21 |
| 23 void StatusController::set_get_updates_request_types(ModelTypeSet value) { | 22 void StatusController::set_get_updates_request_types(ModelTypeSet value) { |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 132 } | 131 } |
| 133 | 132 |
| 134 int StatusController::TotalNumConflictingItems() const { | 133 int StatusController::TotalNumConflictingItems() const { |
| 135 int sum = 0; | 134 int sum = 0; |
| 136 sum += num_encryption_conflicts(); | 135 sum += num_encryption_conflicts(); |
| 137 sum += num_hierarchy_conflicts(); | 136 sum += num_hierarchy_conflicts(); |
| 138 sum += num_server_conflicts(); | 137 sum += num_server_conflicts(); |
| 139 return sum; | 138 return sum; |
| 140 } | 139 } |
| 141 | 140 |
| 142 } // namespace sessions | |
| 143 } // namespace syncer | 141 } // namespace syncer |
| OLD | NEW |