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

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

Issue 11624037: [sync] Componentize sync: Part 6: Add more SYNC_EXPORTs to files in src/sync/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Re-export WeakHandleCoreBase Created 7 years, 12 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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_APPLY_UPDATES_AND_RESOLVE_CONFLICTS_COMMAND_H_ 5 #ifndef SYNC_ENGINE_APPLY_UPDATES_AND_RESOLVE_CONFLICTS_COMMAND_H_
6 #define SYNC_ENGINE_APPLY_UPDATES_AND_RESOLVE_CONFLICTS_COMMAND_H_ 6 #define SYNC_ENGINE_APPLY_UPDATES_AND_RESOLVE_CONFLICTS_COMMAND_H_
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "sync/base/sync_export.h"
9 #include "sync/engine/model_changing_syncer_command.h" 10 #include "sync/engine/model_changing_syncer_command.h"
10 11
11 namespace syncer { 12 namespace syncer {
12 13
13 class ApplyUpdatesAndResolveConflictsCommand 14 class SYNC_EXPORT_PRIVATE ApplyUpdatesAndResolveConflictsCommand
14 : public ModelChangingSyncerCommand { 15 : public ModelChangingSyncerCommand {
15 public: 16 public:
17 friend class ApplyUpdatesAndResolveConflictsCommandTest;
akalin 2012/12/27 19:48:52 out of curiosity, why did this end up being needed
Raghu Simha 2013/01/02 06:49:24 Good question. Turns out it isn't necessary after
16 ApplyUpdatesAndResolveConflictsCommand(); 18 ApplyUpdatesAndResolveConflictsCommand();
17 virtual ~ApplyUpdatesAndResolveConflictsCommand(); 19 virtual ~ApplyUpdatesAndResolveConflictsCommand();
18 20
19 protected: 21 protected:
20 // ModelChangingSyncerCommand implementation. 22 // ModelChangingSyncerCommand implementation.
21 virtual std::set<ModelSafeGroup> GetGroupsToChange( 23 virtual std::set<ModelSafeGroup> GetGroupsToChange(
22 const sessions::SyncSession& session) const OVERRIDE; 24 const sessions::SyncSession& session) const OVERRIDE;
23 virtual SyncerError ModelChangingExecuteImpl( 25 virtual SyncerError ModelChangingExecuteImpl(
24 sessions::SyncSession* session) OVERRIDE; 26 sessions::SyncSession* session) OVERRIDE;
25 27
26 private: 28 private:
27 DISALLOW_COPY_AND_ASSIGN(ApplyUpdatesAndResolveConflictsCommand); 29 DISALLOW_COPY_AND_ASSIGN(ApplyUpdatesAndResolveConflictsCommand);
28 }; 30 };
29 31
30 } // namespace syncer 32 } // namespace syncer
31 33
32 #endif // SYNC_ENGINE_APPLY_UPDATES_AND_RESOLVE_CONFLICTS_COMMAND_H_ 34 #endif // SYNC_ENGINE_APPLY_UPDATES_AND_RESOLVE_CONFLICTS_COMMAND_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698