| Index: chrome/browser/sync/engine/resolve_conflicts_command.h
|
| diff --git a/chrome/browser/sync/engine/resolve_conflicts_command.h b/chrome/browser/sync/engine/resolve_conflicts_command.h
|
| index 8821bf8e623be783afbaaf6214dab795e826adab..24075938630e7576ea56d92f816d6b331269d87c 100644
|
| --- a/chrome/browser/sync/engine/resolve_conflicts_command.h
|
| +++ b/chrome/browser/sync/engine/resolve_conflicts_command.h
|
| @@ -19,7 +19,6 @@ class ResolveConflictsCommand : public ModelChangingSyncerCommand {
|
|
|
| protected:
|
| // ModelChangingSyncerCommand implementation.
|
| - virtual bool HasCustomGroupsToChange() const OVERRIDE;
|
| virtual std::set<ModelSafeGroup> GetGroupsToChange(
|
| const sessions::SyncSession& session) const OVERRIDE;
|
| virtual void ModelChangingExecuteImpl(
|
|
|