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

Side by Side Diff: sync/engine/conflict_resolver.h

Issue 10700154: Remove #pragma once from sync (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « sync/engine/commit.h ('k') | sync/engine/download_updates_command.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 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 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 // 4 //
5 // A class that watches the syncer and attempts to resolve any conflicts that 5 // A class that watches the syncer and attempts to resolve any conflicts that
6 // occur. 6 // occur.
7 7
8 #ifndef SYNC_ENGINE_CONFLICT_RESOLVER_H_ 8 #ifndef SYNC_ENGINE_CONFLICT_RESOLVER_H_
9 #define SYNC_ENGINE_CONFLICT_RESOLVER_H_ 9 #define SYNC_ENGINE_CONFLICT_RESOLVER_H_
10 #pragma once
11 10
12 #include <map> 11 #include <map>
13 #include <set> 12 #include <set>
14 #include <string> 13 #include <string>
15 14
16 #include "base/basictypes.h" 15 #include "base/basictypes.h"
17 #include "base/gtest_prod_util.h" 16 #include "base/gtest_prod_util.h"
18 #include "sync/engine/syncer_types.h" 17 #include "sync/engine/syncer_types.h"
19 18
20 namespace syncer { 19 namespace syncer {
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 const Cryptographer* cryptographer, 79 const Cryptographer* cryptographer,
81 const sessions::ConflictProgress& progress, 80 const sessions::ConflictProgress& progress,
82 sessions::StatusController* status); 81 sessions::StatusController* status);
83 82
84 DISALLOW_COPY_AND_ASSIGN(ConflictResolver); 83 DISALLOW_COPY_AND_ASSIGN(ConflictResolver);
85 }; 84 };
86 85
87 } // namespace syncer 86 } // namespace syncer
88 87
89 #endif // SYNC_ENGINE_CONFLICT_RESOLVER_H_ 88 #endif // SYNC_ENGINE_CONFLICT_RESOLVER_H_
OLDNEW
« no previous file with comments | « sync/engine/commit.h ('k') | sync/engine/download_updates_command.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698