| 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/engine/conflict_resolver.h" | 5 #include "sync/engine/conflict_resolver.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <list> | 8 #include <list> |
| 9 #include <map> | 9 #include <map> |
| 10 #include <set> | 10 #include <set> |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 using std::set; | 25 using std::set; |
| 26 using syncable::BaseTransaction; | 26 using syncable::BaseTransaction; |
| 27 using syncable::Directory; | 27 using syncable::Directory; |
| 28 using syncable::Entry; | 28 using syncable::Entry; |
| 29 using syncable::GetModelTypeFromSpecifics; | 29 using syncable::GetModelTypeFromSpecifics; |
| 30 using syncable::Id; | 30 using syncable::Id; |
| 31 using syncable::IsRealDataType; | 31 using syncable::IsRealDataType; |
| 32 using syncable::MutableEntry; | 32 using syncable::MutableEntry; |
| 33 using syncable::WriteTransaction; | 33 using syncable::WriteTransaction; |
| 34 | 34 |
| 35 namespace csync { | 35 namespace syncer { |
| 36 | 36 |
| 37 using sessions::ConflictProgress; | 37 using sessions::ConflictProgress; |
| 38 using sessions::StatusController; | 38 using sessions::StatusController; |
| 39 | 39 |
| 40 namespace { | 40 namespace { |
| 41 | 41 |
| 42 const int SYNC_CYCLES_BEFORE_ADMITTING_DEFEAT = 8; | 42 const int SYNC_CYCLES_BEFORE_ADMITTING_DEFEAT = 8; |
| 43 | 43 |
| 44 } // namespace | 44 } // namespace |
| 45 | 45 |
| (...skipping 364 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 410 case SYNC_PROGRESS: | 410 case SYNC_PROGRESS: |
| 411 forward_progress = true; | 411 forward_progress = true; |
| 412 break; | 412 break; |
| 413 } | 413 } |
| 414 processed_items.insert(id); | 414 processed_items.insert(id); |
| 415 } | 415 } |
| 416 } | 416 } |
| 417 return forward_progress; | 417 return forward_progress; |
| 418 } | 418 } |
| 419 | 419 |
| 420 } // namespace csync | 420 } // namespace syncer |
| OLD | NEW |