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