Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(919)

Unified Diff: components/sync/engine_impl/conflict_resolver.h

Issue 2425673003: [Sync] Moved down comments directly following copyright. (Closed)
Patch Set: Rebase and removing TODO about exporting. Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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.

Powered by Google App Engine
This is Rietveld 408576698