blob: 2fee08950a820e2af59cf883842239f683e6238f (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
|
// Copyright (c) 2013 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef CHROME_BROWSER_SYNC_FILE_SYSTEM_CONFLICT_RESOLUTION_POLICY_H_
#define CHROME_BROWSER_SYNC_FILE_SYSTEM_CONFLICT_RESOLUTION_POLICY_H_
namespace sync_file_system {
enum ConflictResolutionPolicy {
// Resolution policy unknown or not initialized. Usually indicates an error.
CONFLICT_RESOLUTION_UNKNOWN,
// The service automatically resolves a conflict by choosing the one
// that is updated more recently.
CONFLICT_RESOLUTION_LAST_WRITE_WIN,
// The service does nothing and just leaves conflicting files in
// 'conflicted' state.
CONFLICT_RESOLUTION_MANUAL,
};
} // namespace sync_file_system
#endif // CHROME_BROWSER_SYNC_FILE_SYSTEM_CONFLICT_RESOLUTION_POLICY_H_
|
