Pass factory method in constructor
Add stub ctor and back WindowFactoryMethod
Refactor