Bug 952846 - Ship PDF.js code in Metro Firefox for Nightly builds only [r=jimm]

browser/extensions/Makefile.in

@@ -39,6 +39,7 @@ libs:: $(FINAL_TARGET)/chrome/shumway.manifest
 endif
 
 ifdef MOZ_METRO
+ifdef NIGHTLY_BUILD
 $(DIST)/bin/metro/chrome/pdfjs.manifest: $(GLOBAL_DEPS)
 	printf 'manifest pdfjs/chrome.manifest' > $@
 
@@ -49,7 +50,6 @@ libs:: $(DIST)/bin/metro/chrome/pdfjs.manifest
           $(DIST)/bin/metro/chrome
 	$(call py_action,buildlist,$(DIST)/bin/metro/chrome.manifest 'manifest chrome/pdfjs.manifest')
 
-ifdef NIGHTLY_BUILD
 $(DIST)/bin/metro/chrome/shumway.manifest: $(GLOBAL_DEPS)
 	printf 'manifest shumway/chrome.manifest' > $@
 

browser/installer/package-manifest.in

@@ -609,9 +609,9 @@
 @BINPATH@/browser/chrome.manifest
 @BINPATH@/browser/chrome/browser@JAREXT@
 @BINPATH@/browser/chrome/browser.manifest
+#ifdef NIGHTLY_BUILD
 @BINPATH@/browser/chrome/pdfjs.manifest
 @BINPATH@/browser/chrome/pdfjs/*
-#ifdef NIGHTLY_BUILD
 @BINPATH@/browser/chrome/shumway.manifest
 @BINPATH@/browser/chrome/shumway/*
 #endif

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

@@ -40,11 +40,13 @@ XPCOMUtils.defineLazyModuleGetter(this, "NewTabUtils",
 XPCOMUtils.defineLazyModuleGetter(this, "Promise",
                                   "resource://gre/modules/commonjs/sdk/core/promise.js");
 
+#ifdef NIGHTLY_BUILD
 XPCOMUtils.defineLazyModuleGetter(this, "ShumwayUtils",
                                   "resource://shumway/ShumwayUtils.jsm");
 
 XPCOMUtils.defineLazyModuleGetter(this, "PdfJs",
                                   "resource://pdf.js/PdfJs.jsm");
+#endif
 
 XPCOMUtils.defineLazyModuleGetter(this, "Task",
                                   "resource://gre/modules/Task.jsm");

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

@@ -154,7 +154,9 @@ var BrowserUI = {
         DialogUI.init();
         FormHelperUI.init();
         FindHelperUI.init();
+#ifdef NIGHTLY_BUILD
         PdfJs.init();
+#endif
       } catch(ex) {
         Util.dumpLn("Exception in delay load module:", ex.message);
       }

browser/metro/profile/metro.js

@@ -540,6 +540,7 @@ pref("ui.dragThresholdY", 50);
 // prevent tooltips from showing up
 pref("browser.chrome.toolbar_tips", false);
 
+#ifdef NIGHTLY_BUILD
 // Completely disable pdf.js as an option to preview pdfs within firefox.
 // Note: if this is not disabled it does not necessarily mean pdf.js is the pdf
 // handler just that it is an option.
@@ -551,6 +552,7 @@ pref("pdfjs.firstRun", true);
 // became the default.
 pref("pdfjs.previousHandler.preferredAction", 0);
 pref("pdfjs.previousHandler.alwaysAskBeforeHandling", false);
+#endif
 
 #ifdef NIGHTLY_BUILD
 pref("shumway.disabled", true);