Merge "Move WindowControllerCallback methods into a delagate."