Chromium Code Reviews| Index: components/sync/engine_impl/conflict_util.h |
| diff --git a/components/sync/engine_impl/conflict_util.h b/components/sync/engine_impl/conflict_util.h |
| index 50cb16192dcd75400ff569defa1db08077800271..bd2ee8cf2604a5f6617d9f868685c36160c79359 100644 |
| --- a/components/sync/engine_impl/conflict_util.h |
| +++ b/components/sync/engine_impl/conflict_util.h |
| @@ -1,8 +1,6 @@ |
| // Copyright (c) 2012 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. |
| -// |
| -// Utility functions that act on syncable::MutableEntry to resolve conflicts. |
| #ifndef COMPONENTS_SYNC_ENGINE_IMPL_CONFLICT_UTIL_H_ |
| #define COMPONENTS_SYNC_ENGINE_IMPL_CONFLICT_UTIL_H_ |
| @@ -15,6 +13,8 @@ class MutableEntry; |
| namespace conflict_util { |
| +// Utility functions that act on syncable::MutableEntry to resolve conflicts. |
|
maxbogue
2016/10/17 23:59:46
Could probably put this right above the namespace?
skym
2016/10/18 14:39:08
Done.
|
| + |
| // Marks the item as no longer requiring sync, allowing the server's version |
| // to 'win' during the next update application step. |
| void IgnoreLocalChanges(syncable::MutableEntry* entry); |