conflict_resolution.h 686 B

1234567891011121314151617181920212223
  1. // Copyright 2016 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. #ifndef COMPONENTS_SYNC_MODEL_CONFLICT_RESOLUTION_H_
  5. #define COMPONENTS_SYNC_MODEL_CONFLICT_RESOLUTION_H_
  6. namespace syncer {
  7. // An enum to represent the resolution of a data conflict. We either:
  8. // 1) Use the local client data and update the server.
  9. // 2) Use the remote server data and update the client.
  10. enum class ConflictResolution {
  11. kChangesMatch,
  12. kUseLocal,
  13. kUseRemote,
  14. kIgnoreLocalEncryption,
  15. kIgnoreRemoteEncryption
  16. };
  17. } // namespace syncer
  18. #endif // COMPONENTS_SYNC_MODEL_CONFLICT_RESOLUTION_H_