| Index: chrome/browser/sync/engine/build_and_process_conflict_sets_command.h
|
| diff --git a/chrome/browser/sync/engine/build_and_process_conflict_sets_command.h b/chrome/browser/sync/engine/build_and_process_conflict_sets_command.h
|
| index a446e7e63cf257f10f1489e4d00e5fb0284bf5cf..8ef7b8daa4bf27b040a859e31db19771f344f751 100644
|
| --- a/chrome/browser/sync/engine/build_and_process_conflict_sets_command.h
|
| +++ b/chrome/browser/sync/engine/build_and_process_conflict_sets_command.h
|
| @@ -35,7 +35,10 @@ class BuildAndProcessConflictSetsCommand : public ModelChangingSyncerCommand {
|
| BuildAndProcessConflictSetsCommand();
|
| virtual ~BuildAndProcessConflictSetsCommand();
|
|
|
| + protected:
|
| // ModelChangingSyncerCommand implementation.
|
| + virtual std::set<ModelSafeGroup> GetGroupsToChange(
|
| + const sessions::SyncSession& session) const OVERRIDE;
|
| virtual void ModelChangingExecuteImpl(
|
| sessions::SyncSession* session) OVERRIDE;
|
|
|
|
|