Bug 870799 - Update windowMap API to always use outer window id as parameter. r=ctalbert