chrome/browser/sync/engine/resolve_conflicts_command.cc - Issue 8957001: [Sync] Remove ModelChangingSyncerCommand::HasCustomGroups()

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 8957001: [Sync] Remove ModelChangingSyncerCommand::HasCustomGroups() (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:

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

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

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

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

ResolveConflictsCommand::ResolveConflictsCommand() {}

ResolveConflictsCommand::~ResolveConflictsCommand() {}

-bool ResolveConflictsCommand::HasCustomGroupsToChange() const {

- return true;

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

const sessions::SyncSession& session) const {

return session.GetEnabledGroupsWithConflicts();