Cleaned-up some code in WindowManager

This CL has no functional changes and I am just breaking this change
out of another large CL I am working on.

Test: existing tests pass.
Change-Id: I4c93e2b1820dc31ba28f81692f2f8f6081e1f315
5 files changed