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 1fcdec932f055a7c00394d22d147aa95237d7860..8821bf8e623be783afbaaf6214dab795e826adab 100644 |
--- a/chrome/browser/sync/engine/resolve_conflicts_command.h |
+++ b/chrome/browser/sync/engine/resolve_conflicts_command.h |
@@ -17,7 +17,11 @@ class ResolveConflictsCommand : public ModelChangingSyncerCommand { |
ResolveConflictsCommand(); |
virtual ~ResolveConflictsCommand(); |
+ protected: |
// ModelChangingSyncerCommand implementation. |
+ virtual bool HasCustomGroupsToChange() const OVERRIDE; |
+ virtual std::set<ModelSafeGroup> GetGroupsToChange( |
+ const sessions::SyncSession& session) const OVERRIDE; |
virtual void ModelChangingExecuteImpl( |
sessions::SyncSession* session) OVERRIDE; |