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

Side by Side Diff: sync/engine/resolve_conflicts_command.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/process_updates_command.h ('k') | sync/engine/store_timestamps_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 #ifndef SYNC_ENGINE_RESOLVE_CONFLICTS_COMMAND_H_ 5 #ifndef SYNC_ENGINE_RESOLVE_CONFLICTS_COMMAND_H_
6 #define SYNC_ENGINE_RESOLVE_CONFLICTS_COMMAND_H_ 6 #define SYNC_ENGINE_RESOLVE_CONFLICTS_COMMAND_H_
7 #pragma once
8 7
9 #include "base/basictypes.h" 8 #include "base/basictypes.h"
10 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
11 #include "sync/engine/model_changing_syncer_command.h" 10 #include "sync/engine/model_changing_syncer_command.h"
12 11
13 namespace syncer { 12 namespace syncer {
14 13
15 class ResolveConflictsCommand : public ModelChangingSyncerCommand { 14 class ResolveConflictsCommand : public ModelChangingSyncerCommand {
16 public: 15 public:
17 ResolveConflictsCommand(); 16 ResolveConflictsCommand();
18 virtual ~ResolveConflictsCommand(); 17 virtual ~ResolveConflictsCommand();
19 18
20 protected: 19 protected:
21 // ModelChangingSyncerCommand implementation. 20 // ModelChangingSyncerCommand implementation.
22 virtual std::set<ModelSafeGroup> GetGroupsToChange( 21 virtual std::set<ModelSafeGroup> GetGroupsToChange(
23 const sessions::SyncSession& session) const OVERRIDE; 22 const sessions::SyncSession& session) const OVERRIDE;
24 virtual SyncerError ModelChangingExecuteImpl( 23 virtual SyncerError ModelChangingExecuteImpl(
25 sessions::SyncSession* session) OVERRIDE; 24 sessions::SyncSession* session) OVERRIDE;
26 25
27 private: 26 private:
28 DISALLOW_COPY_AND_ASSIGN(ResolveConflictsCommand); 27 DISALLOW_COPY_AND_ASSIGN(ResolveConflictsCommand);
29 }; 28 };
30 29
31 } // namespace syncer 30 } // namespace syncer
32 31
33 #endif // SYNC_ENGINE_RESOLVE_CONFLICTS_COMMAND_H_ 32 #endif // SYNC_ENGINE_RESOLVE_CONFLICTS_COMMAND_H_
OLDNEW
« no previous file with comments | « sync/engine/process_updates_command.h ('k') | sync/engine/store_timestamps_command.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698