sync/engine/resolve_conflicts_command.h - Issue 10933075: FYI: Remove PerModelSafeGroupState + move ConflictResolution

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 10933075: FYI: Remove PerModelSafeGroupState + move ConflictResolution (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 3 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:

OLD	NEW
	(Empty)
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

3 // found in the LICENSE file.

4

5 #ifndef SYNC_ENGINE_RESOLVE_CONFLICTS_COMMAND_H_

6 #define SYNC_ENGINE_RESOLVE_CONFLICTS_COMMAND_H_

7

8 #include "base/basictypes.h"

9 #include "base/compiler_specific.h"

10 #include "sync/engine/model_changing_syncer_command.h"

11

12 namespace syncer {

13

14 class ResolveConflictsCommand : public ModelChangingSyncerCommand {

15 public:

16 ResolveConflictsCommand();

17 virtual ~ResolveConflictsCommand();

18

19 protected:

20 // ModelChangingSyncerCommand implementation.

21 virtual std::set<ModelSafeGroup> GetGroupsToChange(

22 const sessions::SyncSession& session) const OVERRIDE;

23 virtual SyncerError ModelChangingExecuteImpl(

24 sessions::SyncSession* session) OVERRIDE;

25

26 private:

27 DISALLOW_COPY_AND_ASSIGN(ResolveConflictsCommand);

28 };

29

30 } // namespace syncer

31

32 #endif // SYNC_ENGINE_RESOLVE_CONFLICTS_COMMAND_H_

OLD	NEW