conflict_resolution_policy.h revision 2a99a7e74a7f215066514fe81d2bfa6639d9eddd 
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
3// found in the LICENSE file.
4
5#ifndef CHROME_BROWSER_SYNC_FILE_SYSTEM_CONFLICT_RESOLUTION_POLICY_H_
6#define CHROME_BROWSER_SYNC_FILE_SYSTEM_CONFLICT_RESOLUTION_POLICY_H_
7
8namespace sync_file_system {
9
10enum ConflictResolutionPolicy {
11  // Resolution policy unknown or not initialized. Usually indicates an error.
12  CONFLICT_RESOLUTION_UNKNOWN,
13
14  // The service automatically resolves a conflict by choosing the one
15  // that is updated more recently.
16  CONFLICT_RESOLUTION_LAST_WRITE_WIN,
17
18  // The service does nothing and just leaves conflicting files in
19  // 'conflicted' state.
20  CONFLICT_RESOLUTION_MANUAL,
21};
22
23}  // namespace sync_file_system
24
25#endif  // CHROME_BROWSER_SYNC_FILE_SYSTEM_CONFLICT_RESOLUTION_POLICY_H_
26