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 // A class that watches the syncer and attempts to resolve any conflicts that | 5 // A class that watches the syncer and attempts to resolve any conflicts that |
6 // occur. | 6 // occur. |
7 | 7 |
8 #ifndef CHROME_BROWSER_SYNC_ENGINE_CONFLICT_RESOLVER_H_ | 8 #ifndef SYNC_ENGINE_CONFLICT_RESOLVER_H_ |
9 #define CHROME_BROWSER_SYNC_ENGINE_CONFLICT_RESOLVER_H_ | 9 #define SYNC_ENGINE_CONFLICT_RESOLVER_H_ |
10 #pragma once | 10 #pragma once |
11 | 11 |
12 #include <map> | 12 #include <map> |
13 #include <set> | 13 #include <set> |
14 #include <string> | 14 #include <string> |
15 | 15 |
16 #include "base/basictypes.h" | 16 #include "base/basictypes.h" |
17 #include "base/gtest_prod_util.h" | 17 #include "base/gtest_prod_util.h" |
18 #include "chrome/browser/sync/engine/syncer_types.h" | 18 #include "sync/engine/syncer_types.h" |
19 | 19 |
20 namespace syncable { | 20 namespace syncable { |
21 class BaseTransaction; | 21 class BaseTransaction; |
22 class Id; | 22 class Id; |
23 class MutableEntry; | 23 class MutableEntry; |
24 class WriteTransaction; | 24 class WriteTransaction; |
25 } // namespace syncable | 25 } // namespace syncable |
26 | 26 |
27 namespace browser_sync { | 27 namespace browser_sync { |
28 | 28 |
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
79 bool ResolveSimpleConflicts(syncable::WriteTransaction* trans, | 79 bool ResolveSimpleConflicts(syncable::WriteTransaction* trans, |
80 const Cryptographer* cryptographer, | 80 const Cryptographer* cryptographer, |
81 const sessions::ConflictProgress& progress, | 81 const sessions::ConflictProgress& progress, |
82 sessions::StatusController* status); | 82 sessions::StatusController* status); |
83 | 83 |
84 DISALLOW_COPY_AND_ASSIGN(ConflictResolver); | 84 DISALLOW_COPY_AND_ASSIGN(ConflictResolver); |
85 }; | 85 }; |
86 | 86 |
87 } // namespace browser_sync | 87 } // namespace browser_sync |
88 | 88 |
89 #endif // CHROME_BROWSER_SYNC_ENGINE_CONFLICT_RESOLVER_H_ | 89 #endif // SYNC_ENGINE_CONFLICT_RESOLVER_H_ |
OLD | NEW |