| Index: chrome/browser/sync/engine/build_and_process_conflict_sets_command.h
|
| ===================================================================
|
| --- chrome/browser/sync/engine/build_and_process_conflict_sets_command.h (revision 112758)
|
| +++ chrome/browser/sync/engine/build_and_process_conflict_sets_command.h (working copy)
|
| @@ -35,10 +35,7 @@
|
| BuildAndProcessConflictSetsCommand();
|
| virtual ~BuildAndProcessConflictSetsCommand();
|
|
|
| - protected:
|
| // ModelChangingSyncerCommand implementation.
|
| - virtual std::set<ModelSafeGroup> GetGroupsToChange(
|
| - const sessions::SyncSession& session) const OVERRIDE;
|
| virtual void ModelChangingExecuteImpl(
|
| sessions::SyncSession* session) OVERRIDE;
|
|
|
|
|