| Index: components/sync/engine_impl/conflict_resolver.h
|
| diff --git a/components/sync/engine_impl/conflict_resolver.h b/components/sync/engine_impl/conflict_resolver.h
|
| index a0b0f6e313ef96aec38ce9883f0c978f58130234..3d8e81e84215feb05afd0b8a0dbcce718bb6c091 100644
|
| --- a/components/sync/engine_impl/conflict_resolver.h
|
| +++ b/components/sync/engine_impl/conflict_resolver.h
|
| @@ -1,9 +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.
|
| -//
|
| -// A class that watches the syncer and attempts to resolve any conflicts that
|
| -// occur.
|
|
|
| #ifndef COMPONENTS_SYNC_ENGINE_IMPL_CONFLICT_RESOLVER_H_
|
| #define COMPONENTS_SYNC_ENGINE_IMPL_CONFLICT_RESOLVER_H_
|
| @@ -25,6 +22,8 @@ class Cryptographer;
|
| class StatusController;
|
| struct UpdateCounters;
|
|
|
| +// A class that watches the syncer and attempts to resolve any conflicts that
|
| +// occur.
|
| class ConflictResolver {
|
| public:
|
| // Enumeration of different conflict resolutions. Used for histogramming.
|
|
|