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

Side by Side Diff: chrome/browser/sync/engine/resolve_conflicts_command.h

Issue 386030: Relieve SyncerSession,SyncCycleState, SyncProcessState, SyncerSession, Syncer... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 1 month 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) 2006-2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2009 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 CHROME_BROWSER_SYNC_ENGINE_RESOLVE_CONFLICTS_COMMAND_H_ 5 #ifndef CHROME_BROWSER_SYNC_ENGINE_RESOLVE_CONFLICTS_COMMAND_H_
6 #define CHROME_BROWSER_SYNC_ENGINE_RESOLVE_CONFLICTS_COMMAND_H_ 6 #define CHROME_BROWSER_SYNC_ENGINE_RESOLVE_CONFLICTS_COMMAND_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "chrome/browser/sync/engine/model_changing_syncer_command.h" 9 #include "chrome/browser/sync/engine/model_changing_syncer_command.h"
10 10
11 namespace syncable { 11 namespace syncable {
12 class WriteTransaction; 12 class WriteTransaction;
13 class MutableEntry; 13 class MutableEntry;
14 class Id; 14 class Id;
15 } 15 }
16 16
17 namespace browser_sync { 17 namespace browser_sync {
18 18
19 class SyncerSession;
20
21 class ResolveConflictsCommand : public ModelChangingSyncerCommand { 19 class ResolveConflictsCommand : public ModelChangingSyncerCommand {
22 public: 20 public:
23 ResolveConflictsCommand(); 21 ResolveConflictsCommand();
24 virtual ~ResolveConflictsCommand(); 22 virtual ~ResolveConflictsCommand();
25 23
26 virtual void ModelChangingExecuteImpl(SyncerSession* session); 24 // ModelChangingSyncerCommand implementation.
25 virtual void ModelChangingExecuteImpl(sessions::SyncSession* session);
27 26
28 private: 27 private:
29 DISALLOW_COPY_AND_ASSIGN(ResolveConflictsCommand); 28 DISALLOW_COPY_AND_ASSIGN(ResolveConflictsCommand);
30 }; 29 };
31 30
32 } // namespace browser_sync 31 } // namespace browser_sync
33 32
34 #endif // CHROME_BROWSER_SYNC_ENGINE_RESOLVE_CONFLICTS_COMMAND_H_ 33 #endif // CHROME_BROWSER_SYNC_ENGINE_RESOLVE_CONFLICTS_COMMAND_H_
OLDNEW
« no previous file with comments | « chrome/browser/sync/engine/process_updates_command.cc ('k') | chrome/browser/sync/engine/resolve_conflicts_command.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698