sync/engine/resolve_conflicts_command.cc - Issue 9699057: [Sync] Move 'sync' target to sync/

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.cc

Issue 9699057: [Sync] Move 'sync' target to sync/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address Tim's comments Created 8 years, 9 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/resolve_conflicts_command.h ('k') | sync/engine/resolve_conflicts_command_unittest.cc » ('j') | no next file with comments »

OLD	NEW
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 #include "chrome/browser/sync/engine/resolve_conflicts_command.h"	5 #include "sync/engine/resolve_conflicts_command.h"

6	6

7 #include "chrome/browser/sync/engine/conflict_resolver.h"	7 #include "sync/engine/conflict_resolver.h"

8 #include "chrome/browser/sync/sessions/session_state.h"	8 #include "sync/sessions/session_state.h"

9 #include "chrome/browser/sync/sessions/sync_session.h"	9 #include "sync/sessions/sync_session.h"

10 #include "chrome/browser/sync/syncable/syncable.h"	10 #include "sync/syncable/syncable.h"

11	11

12 namespace browser_sync {	12 namespace browser_sync {

13	13

14 ResolveConflictsCommand::ResolveConflictsCommand() {}	14 ResolveConflictsCommand::ResolveConflictsCommand() {}

15 ResolveConflictsCommand::~ResolveConflictsCommand() {}	15 ResolveConflictsCommand::~ResolveConflictsCommand() {}

16	16

17 std::set<ModelSafeGroup> ResolveConflictsCommand::GetGroupsToChange(	17 std::set<ModelSafeGroup> ResolveConflictsCommand::GetGroupsToChange(

18 const sessions::SyncSession& session) const {	18 const sessions::SyncSession& session) const {

19 return session.GetEnabledGroupsWithConflicts();	19 return session.GetEnabledGroupsWithConflicts();

20 }	20 }

(...skipping 10 matching lines...) Expand all Loading...
31 return SYNCER_OK; // Nothing to do.	31 return SYNCER_OK; // Nothing to do.

32 syncable::WriteTransaction trans(FROM_HERE, syncable::SYNCER, dir);	32 syncable::WriteTransaction trans(FROM_HERE, syncable::SYNCER, dir);

33 const Cryptographer* cryptographer = dir->GetCryptographer(&trans);	33 const Cryptographer* cryptographer = dir->GetCryptographer(&trans);

34 status->update_conflicts_resolved(	34 status->update_conflicts_resolved(

35 resolver->ResolveConflicts(&trans, cryptographer, *progress, status));	35 resolver->ResolveConflicts(&trans, cryptographer, *progress, status));

36	36

37 return SYNCER_OK;	37 return SYNCER_OK;

38 }	38 }

39	39

40 } // namespace browser_sync	40 } // namespace browser_sync

OLD	NEW