| 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/session_state.h" | 5 #include "sync/sessions/session_state.h" |
| 6 | 6 |
| 7 #include <set> | 7 #include <set> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| 11 #include "base/values.h" | 11 #include "base/values.h" |
| 12 | 12 |
| 13 using std::set; | 13 using std::set; |
| 14 using std::vector; | 14 using std::vector; |
| 15 | 15 |
| 16 namespace csync { | 16 namespace syncer { |
| 17 namespace sessions { | 17 namespace sessions { |
| 18 | 18 |
| 19 ConflictProgress::ConflictProgress() | 19 ConflictProgress::ConflictProgress() |
| 20 : num_server_conflicting_items(0), num_hierarchy_conflicting_items(0), | 20 : num_server_conflicting_items(0), num_hierarchy_conflicting_items(0), |
| 21 num_encryption_conflicting_items(0) { | 21 num_encryption_conflicting_items(0) { |
| 22 } | 22 } |
| 23 | 23 |
| 24 ConflictProgress::~ConflictProgress() { | 24 ConflictProgress::~ConflictProgress() { |
| 25 } | 25 } |
| 26 | 26 |
| (...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 132 return false; | 132 return false; |
| 133 } | 133 } |
| 134 | 134 |
| 135 PerModelSafeGroupState::PerModelSafeGroupState() { | 135 PerModelSafeGroupState::PerModelSafeGroupState() { |
| 136 } | 136 } |
| 137 | 137 |
| 138 PerModelSafeGroupState::~PerModelSafeGroupState() { | 138 PerModelSafeGroupState::~PerModelSafeGroupState() { |
| 139 } | 139 } |
| 140 | 140 |
| 141 } // namespace sessions | 141 } // namespace sessions |
| 142 } // namespace csync | 142 } // namespace syncer |
| OLD | NEW |