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 "chrome/browser/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> |
11 | 11 |
12 #include "base/location.h" | 12 #include "base/location.h" |
13 #include "base/metrics/histogram.h" | 13 #include "base/metrics/histogram.h" |
14 #include "chrome/browser/sync/engine/syncer.h" | 14 #include "sync/engine/syncer.h" |
15 #include "chrome/browser/sync/engine/syncer_util.h" | 15 #include "sync/engine/syncer_util.h" |
16 #include "chrome/browser/sync/protocol/service_constants.h" | |
17 #include "chrome/browser/sync/sessions/status_controller.h" | |
18 #include "chrome/browser/sync/syncable/syncable.h" | |
19 #include "chrome/browser/sync/util/cryptographer.h" | |
20 #include "sync/protocol/nigori_specifics.pb.h" | 16 #include "sync/protocol/nigori_specifics.pb.h" |
| 17 #include "sync/protocol/service_constants.h" |
| 18 #include "sync/sessions/status_controller.h" |
| 19 #include "sync/syncable/syncable.h" |
| 20 #include "sync/util/cryptographer.h" |
21 | 21 |
22 using std::list; | 22 using std::list; |
23 using std::map; | 23 using std::map; |
24 using std::set; | 24 using std::set; |
25 using syncable::BaseTransaction; | 25 using syncable::BaseTransaction; |
26 using syncable::Directory; | 26 using syncable::Directory; |
27 using syncable::Entry; | 27 using syncable::Entry; |
28 using syncable::GetModelTypeFromSpecifics; | 28 using syncable::GetModelTypeFromSpecifics; |
29 using syncable::Id; | 29 using syncable::Id; |
30 using syncable::IsRealDataType; | 30 using syncable::IsRealDataType; |
(...skipping 364 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
395 forward_progress = true; | 395 forward_progress = true; |
396 break; | 396 break; |
397 } | 397 } |
398 processed_items.insert(id); | 398 processed_items.insert(id); |
399 } | 399 } |
400 } | 400 } |
401 return forward_progress; | 401 return forward_progress; |
402 } | 402 } |
403 | 403 |
404 } // namespace browser_sync | 404 } // namespace browser_sync |
OLD | NEW |