| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/session_state.h" | 5 #include "chrome/browser/sync/sessions/session_state.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 #include <set> | 8 #include <set> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 221 std::set<ConflictSet*>::const_iterator | 221 std::set<ConflictSet*>::const_iterator |
| 222 ConflictProgress::ConflictSetsEnd() const { | 222 ConflictProgress::ConflictSetsEnd() const { |
| 223 return conflict_sets_.end(); | 223 return conflict_sets_.end(); |
| 224 } | 224 } |
| 225 | 225 |
| 226 std::set<ConflictSet*>::size_type | 226 std::set<ConflictSet*>::size_type |
| 227 ConflictProgress::ConflictSetsSize() const { | 227 ConflictProgress::ConflictSetsSize() const { |
| 228 return conflict_sets_.size(); | 228 return conflict_sets_.size(); |
| 229 } | 229 } |
| 230 | 230 |
| 231 std::set<syncable::Id>::iterator | 231 std::set<syncable::Id>::const_iterator |
| 232 ConflictProgress::ConflictingItemsBegin() { | 232 ConflictProgress::ConflictingItemsBegin() const { |
| 233 return conflicting_item_ids_.begin(); | 233 return conflicting_item_ids_.begin(); |
| 234 } | 234 } |
| 235 std::set<syncable::Id>::const_iterator | 235 std::set<syncable::Id>::const_iterator |
| 236 ConflictProgress::ConflictingItemsBeginConst() const { | |
| 237 return conflicting_item_ids_.begin(); | |
| 238 } | |
| 239 std::set<syncable::Id>::const_iterator | |
| 240 ConflictProgress::ConflictingItemsEnd() const { | 236 ConflictProgress::ConflictingItemsEnd() const { |
| 241 return conflicting_item_ids_.end(); | 237 return conflicting_item_ids_.end(); |
| 242 } | 238 } |
| 243 | 239 |
| 244 void ConflictProgress::AddConflictingItemById(const syncable::Id& the_id) { | 240 void ConflictProgress::AddConflictingItemById(const syncable::Id& the_id) { |
| 245 std::pair<std::set<syncable::Id>::iterator, bool> ret = | 241 std::pair<std::set<syncable::Id>::iterator, bool> ret = |
| 246 conflicting_item_ids_.insert(the_id); | 242 conflicting_item_ids_.insert(the_id); |
| 247 if (ret.second) | 243 if (ret.second) |
| 248 *dirty_ = true; | 244 *dirty_ = true; |
| 249 } | 245 } |
| (...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 391 | 387 |
| 392 PerModelSafeGroupState::PerModelSafeGroupState(bool* dirty_flag) | 388 PerModelSafeGroupState::PerModelSafeGroupState(bool* dirty_flag) |
| 393 : conflict_progress(dirty_flag) { | 389 : conflict_progress(dirty_flag) { |
| 394 } | 390 } |
| 395 | 391 |
| 396 PerModelSafeGroupState::~PerModelSafeGroupState() { | 392 PerModelSafeGroupState::~PerModelSafeGroupState() { |
| 397 } | 393 } |
| 398 | 394 |
| 399 } // namespace sessions | 395 } // namespace sessions |
| 400 } // namespace browser_sync | 396 } // namespace browser_sync |
| OLD | NEW |