chrome/browser/sync/engine/resolve_conflicts_command.cc - Issue 8637006: [Sync] Make syncer commands avoid posting tasks on threads with no work to do

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

Unified Diff: chrome/browser/sync/engine/resolve_conflicts_command.cc

Issue 8637006: [Sync] Make syncer commands avoid posting tasks on threads with no work to do (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Sync to head, fix windows compile Created 9 years 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/sync/engine/resolve_conflicts_command.h ('k') | chrome/browser/sync/engine/resolve_conflicts_command_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/engine/resolve_conflicts_command.cc

diff --git a/chrome/browser/sync/engine/resolve_conflicts_command.cc b/chrome/browser/sync/engine/resolve_conflicts_command.cc

index 71351c487a3fc68640adb6336c94ba9b721e48a4..b0e5f5e248ac0d82a26951b298cd16d81742f5a7 100644

--- a/chrome/browser/sync/engine/resolve_conflicts_command.cc

+++ b/chrome/browser/sync/engine/resolve_conflicts_command.cc

@@ -14,6 +14,16 @@ namespace browser_sync {

ResolveConflictsCommand::ResolveConflictsCommand() {}

ResolveConflictsCommand::~ResolveConflictsCommand() {}

+bool ResolveConflictsCommand::HasCustomGroupsToChange() const {

+ // TODO(akalin): Set to true.

+ return false;

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

+ const sessions::SyncSession& session) const {

+ return session.GetEnabledGroupsWithConflicts();

void ResolveConflictsCommand::ModelChangingExecuteImpl(

sessions::SyncSession* session) {

ConflictResolver* resolver = session->context()->resolver();