OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 #ifndef CHROME_BROWSER_SYNC_FILE_SYSTEM_CONFLICT_RESOLUTION_POLICY_H_ | 5 #ifndef CHROME_BROWSER_SYNC_FILE_SYSTEM_CONFLICT_RESOLUTION_POLICY_H_ |
6 #define CHROME_BROWSER_SYNC_FILE_SYSTEM_CONFLICT_RESOLUTION_POLICY_H_ | 6 #define CHROME_BROWSER_SYNC_FILE_SYSTEM_CONFLICT_RESOLUTION_POLICY_H_ |
7 | 7 |
8 namespace sync_file_system { | 8 namespace sync_file_system { |
9 | 9 |
10 enum ConflictResolutionPolicy { | 10 enum ConflictResolutionPolicy { |
11 // Resolution policy unknown or not initialized. Usually indicates an error. | 11 // Resolution policy unknown or not initialized. Usually indicates an error. |
12 CONFLICT_RESOLUTION_POLICY_UNKNOWN, | 12 CONFLICT_RESOLUTION_POLICY_UNKNOWN = 0, |
13 | 13 |
14 // The service automatically resolves a conflict by choosing the one | 14 // The service automatically resolves a conflict by choosing the one |
15 // that is updated more recently. | 15 // that is updated more recently. |
16 CONFLICT_RESOLUTION_POLICY_LAST_WRITE_WIN, | 16 CONFLICT_RESOLUTION_POLICY_LAST_WRITE_WIN, |
17 | 17 |
18 // The service does nothing and just leaves conflicting files in | 18 // The service does nothing and just leaves conflicting files in |
19 // 'conflicted' state. | 19 // 'conflicted' state. |
20 CONFLICT_RESOLUTION_POLICY_MANUAL, | 20 CONFLICT_RESOLUTION_POLICY_MANUAL, |
| 21 |
| 22 CONFLICT_RESOLUTION_POLICY_MAX, |
21 }; | 23 }; |
22 | 24 |
23 } // namespace sync_file_system | 25 } // namespace sync_file_system |
24 | 26 |
25 #endif // CHROME_BROWSER_SYNC_FILE_SYSTEM_CONFLICT_RESOLUTION_POLICY_H_ | 27 #endif // CHROME_BROWSER_SYNC_FILE_SYSTEM_CONFLICT_RESOLUTION_POLICY_H_ |
OLD | NEW |