Bug 923596 - Integrate shumway into Metro UI (disabled by default) [r=jimm,gps]

browser/extensions/Makefile.in

@@ -36,10 +36,16 @@ ifdef MOZ_METRO
 $(DIST)/bin/metro/chrome/pdfjs.manifest: $(GLOBAL_DEPS)
 	printf "manifest pdfjs/chrome.manifest" > $@
 
-libs:: $(DIST)/bin/metro/chrome/pdfjs.manifest
+$(DIST)/bin/metro/chrome/shumway.manifest: $(GLOBAL_DEPS)
+	printf "manifest shumway/chrome.manifest" > $@
+
+libs:: $(DIST)/bin/metro/chrome/pdfjs.manifest $(DIST)/bin/metro/chrome/shumway.manifest
 	$(PYTHON) $(topsrcdir)/config/nsinstall.py \
 	  $(srcdir)/pdfjs \
           $(foreach exclude,$(exclude_files), -X $(srcdir)/pdfjs/$(exclude)) \
+	  $(srcdir)/shumway \
+          $(foreach exclude,$(exclude_files), -X $(srcdir)/shumway/$(exclude)) \
           $(DIST)/bin/metro/chrome
 	$(call py_action,buildlist,$(DIST)/bin/metro/chrome.manifest "manifest chrome/pdfjs.manifest")
+	$(call py_action,buildlist,$(DIST)/bin/metro/chrome.manifest "manifest chrome/shumway.manifest")
 endif

browser/metro/base/content/browser-scripts.js

@@ -37,6 +37,9 @@ XPCOMUtils.defineLazyModuleGetter(this, "NewTabUtils",
 XPCOMUtils.defineLazyModuleGetter(this, "Promise",
                                   "resource://gre/modules/commonjs/sdk/core/promise.js");
 
+XPCOMUtils.defineLazyModuleGetter(this, "ShumwayUtils",
+                                  "resource://shumway/ShumwayUtils.jsm");
+
 XPCOMUtils.defineLazyModuleGetter(this, "Task",
                                   "resource://gre/modules/Task.jsm");
 

browser/metro/base/content/browser-ui.js

@@ -112,6 +112,7 @@ var BrowserUI = {
     NewTabUtils.init();
     SettingsCharm.init();
     NavButtonSlider.init();
+    ShumwayUtils.init();
 
     // We can delay some initialization until after startup.  We wait until
     // the first page is shown, then dispatch a UIReadyDelayed event.

browser/metro/profile/metro.js

@@ -576,6 +576,8 @@ pref("pdfjs.firstRun", false);
 pref("pdfjs.previousHandler.preferredAction", 0);
 pref("pdfjs.previousHandler.alwaysAskBeforeHandling", false);
 
+pref("shumway.disabled", true);
+
 // The maximum amount of decoded image data we'll willingly keep around (we
 // might keep around more than this, but we'll try to get down to this value).
 // (This is intentionally on the high side; see bug 746055.)