Revert of Add button to add new FSP services to Files app. (patchset #8 id:140001...
[chromium-blink-merge.git] / chrome / browser / sync_file_system / conflict_resolution_policy.h
blobf451d071a5f6352e56f7211e0aec84064054160c
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.
5 #ifndef CHROME_BROWSER_SYNC_FILE_SYSTEM_CONFLICT_RESOLUTION_POLICY_H_
6 #define CHROME_BROWSER_SYNC_FILE_SYSTEM_CONFLICT_RESOLUTION_POLICY_H_
8 namespace sync_file_system {
10 enum ConflictResolutionPolicy {
11 // Resolution policy unknown or not initialized. Usually indicates an error.
12 CONFLICT_RESOLUTION_POLICY_UNKNOWN = 0,
14 // The service automatically resolves a conflict by choosing the one
15 // that is updated more recently.
16 CONFLICT_RESOLUTION_POLICY_LAST_WRITE_WIN,
18 // The service does nothing and just leaves conflicting files in
19 // 'conflicted' state.
20 CONFLICT_RESOLUTION_POLICY_MANUAL,
22 CONFLICT_RESOLUTION_POLICY_MAX,
25 } // namespace sync_file_system
27 #endif // CHROME_BROWSER_SYNC_FILE_SYSTEM_CONFLICT_RESOLUTION_POLICY_H_