chrome/browser/sync/engine/resolve_conflicts_command.cc - Issue 8822018: [Sync] Set HasCustomGroupsToChange() to true for ResolveConflictsCommand

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 8822018: [Sync] Set HasCustomGroupsToChange() to true for ResolveConflictsCommand (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: 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

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 b0e5f5e248ac0d82a26951b298cd16d81742f5a7..a9018e96d5d1b655fcc87af3807ea9c5962b98a2 100644

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

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

@@ -15,8 +15,7 @@ ResolveConflictsCommand::ResolveConflictsCommand() {}

ResolveConflictsCommand::~ResolveConflictsCommand() {}

bool ResolveConflictsCommand::HasCustomGroupsToChange() const {

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

- return false;

+ return true;

}

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

« no previous file with comments | « no previous file | no next file » | no next file with comments »