Bug 1015163 - Always show the menu button in popup windows. r=gijs,enn

--HG--
extra : rebase_source : 942adb801c3261cdfc23a7d9f57321206c5e22d4
Bug 1110069 - Replace getBrowser() with gBrowser. r=dao

--HG--
extra : rebase_source : 4db6c01d37ea4e38e94f70a677c5d31decd22f72