Android WebView: post QuotaManager calls to UI thread.
[chromium-blink-merge.git] / sync / engine / conflict_util.h
blob0f3a58be45540b4c8debf3e7b52bc1a847530dd7
1 // Copyright (c) 2012 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 // Utility functions that act on syncable::MutableEntry to resolve conflicts.
7 #ifndef SYNC_ENGINE_CONFLICT_UTIL_H_
8 #define SYNC_ENGINE_CONFLICT_UTIL_H_
10 namespace syncer {
12 namespace syncable {
13 class MutableEntry;
16 namespace conflict_util {
18 // Marks the item as no longer requiring sync, allowing the server's version
19 // to 'win' during the next update application step.
20 void IgnoreLocalChanges(syncable::MutableEntry* entry);
22 // Marks the item as no longer requiring update from server data. This will
23 // cause the item to be committed to the server, overwriting the server's
24 // version.
25 void OverwriteServerChanges(syncable::MutableEntry* entry);
27 // The local and server versions are identical, so unset the bits that put them
28 // into a conflicting state.
29 void IgnoreConflict(syncable::MutableEntry *trans);
31 } // namespace conflict_util
32 } // namespace syncer
34 #endif // SYNC_ENGINE_CONFLICT_UTIL_H_