Bug 1097185 - Adds e10s content initialization of Shumway. r=jmathies

This commit is contained in:
Yury Delendik 2015-01-29 09:28:11 -06:00
Родитель 797f4529b9
Коммит 465925e783
1 изменённых файлов: 6 добавлений и 3 удалений

Просмотреть файл

@ -580,9 +580,6 @@ BrowserGlue.prototype = {
if (Services.prefs.getBoolPref("dom.identity.enabled")) {
SignInToWebsiteUX.init();
}
#endif
#ifdef NIGHTLY_BUILD
ShumwayUtils.init();
#endif
webrtcUI.init();
AboutHome.init();
@ -756,6 +753,12 @@ BrowserGlue.prototype = {
// With older versions of the extension installed, this load will fail
// passively.
aWindow.messageManager.loadFrameScript("resource://pdf.js/pdfjschildbootstrap.js", true);
#ifdef NIGHTLY_BUILD
// Registering Shumway bootstrap script the child processes.
aWindow.messageManager.loadFrameScript("chrome://shumway/content/bootstrap-content.js", true);
// Initializing Shumway (shall be run after child script registration).
ShumwayUtils.init();
#endif
#ifdef XP_WIN
// For windows seven, initialize the jump list module.
const WINTASKBAR_CONTRACTID = "@mozilla.org/windows-taskbar;1";