diff --git a/browser/app/profile/extensions/Makefile.in b/browser/app/profile/extensions/Makefile.in index 4f7b9f4163b..0cf92453541 100644 --- a/browser/app/profile/extensions/Makefile.in +++ b/browser/app/profile/extensions/Makefile.in @@ -14,7 +14,6 @@ include $(DEPTH)/config/autoconf.mk DIRS = \ {972ce4c6-7e08-4474-a285-3208198ce6fd} \ - uriloader@pdf.js \ $(NULL) include $(topsrcdir)/config/rules.mk diff --git a/browser/app/profile/extensions/uriloader@pdf.js/Makefile.in b/browser/app/profile/extensions/uriloader@pdf.js/Makefile.in deleted file mode 100644 index 0c923a4f86d..00000000000 --- a/browser/app/profile/extensions/uriloader@pdf.js/Makefile.in +++ /dev/null @@ -1,30 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this file, -# You can obtain one at http://mozilla.org/MPL/2.0/. - -DEPTH = ../../../../.. -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -APPEXT = $(call core_abspath,$(DIST))/bin/extensions - -TEST_DIRS += test - -include $(DEPTH)/config/autoconf.mk -include $(topsrcdir)/config/rules.mk - -# Using the extension-files as an extension files whitelist to avoid noise -# in the xpi file such as MOZILLA.readme, install.pdf.in and this make file. -FILES := $(shell cat $(srcdir)/extension-files) - -libs:: - $(PYTHON) $(MOZILLA_DIR)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) $(srcdir)/install.rdf.in > install.rdf - $(ZIP) -9X $(APPEXT)/uriloader@pdf.js.xpi install.rdf - cd $(call core_abspath,$(srcdir)) && \ - $(ZIP) -9X $(APPEXT)/uriloader@pdf.js.xpi $(FILES) - -install:: - $(SYSINSTALL) $(IFLAGS1) $(APPEXT)/uriloader@pdf.js.xpi $(DESTDIR)$(mozappdir)/extensions - -GARBAGE += install.rdf diff --git a/browser/app/profile/extensions/uriloader@pdf.js/LICENSE b/browser/extensions/pdfjs/LICENSE similarity index 100% rename from browser/app/profile/extensions/uriloader@pdf.js/LICENSE rename to browser/extensions/pdfjs/LICENSE diff --git a/browser/app/profile/extensions/uriloader@pdf.js/README.mozilla b/browser/extensions/pdfjs/README.mozilla similarity index 100% rename from browser/app/profile/extensions/uriloader@pdf.js/README.mozilla rename to browser/extensions/pdfjs/README.mozilla diff --git a/browser/app/profile/extensions/uriloader@pdf.js/bootstrap.js b/browser/extensions/pdfjs/bootstrap.js similarity index 100% rename from browser/app/profile/extensions/uriloader@pdf.js/bootstrap.js rename to browser/extensions/pdfjs/bootstrap.js diff --git a/browser/extensions/pdfjs/chrome.manifest b/browser/extensions/pdfjs/chrome.manifest new file mode 100644 index 00000000000..2618c476b5d --- /dev/null +++ b/browser/extensions/pdfjs/chrome.manifest @@ -0,0 +1,3 @@ +resource pdf.js content/ +component {6457a96b-2d68-439a-bcfa-44465fbcdbb1} components/PdfStreamConverter.js +contract @mozilla.org/streamconv;1?from=application/pdf&to=*/* {6457a96b-2d68-439a-bcfa-44465fbcdbb1} diff --git a/browser/app/profile/extensions/uriloader@pdf.js/components/PdfStreamConverter.js b/browser/extensions/pdfjs/components/PdfStreamConverter.js similarity index 100% rename from browser/app/profile/extensions/uriloader@pdf.js/components/PdfStreamConverter.js rename to browser/extensions/pdfjs/components/PdfStreamConverter.js diff --git a/browser/app/profile/extensions/uriloader@pdf.js/content/web/debugger.js b/browser/extensions/pdfjs/content/web/debugger.js similarity index 100% rename from browser/app/profile/extensions/uriloader@pdf.js/content/web/debugger.js rename to browser/extensions/pdfjs/content/web/debugger.js diff --git a/browser/app/profile/extensions/uriloader@pdf.js/content/web/images/bookmark.svg b/browser/extensions/pdfjs/content/web/images/bookmark.svg similarity index 100% rename from browser/app/profile/extensions/uriloader@pdf.js/content/web/images/bookmark.svg rename to browser/extensions/pdfjs/content/web/images/bookmark.svg diff --git a/browser/app/profile/extensions/uriloader@pdf.js/content/web/images/check.svg b/browser/extensions/pdfjs/content/web/images/check.svg similarity index 100% rename from browser/app/profile/extensions/uriloader@pdf.js/content/web/images/check.svg rename to browser/extensions/pdfjs/content/web/images/check.svg diff --git a/browser/app/profile/extensions/uriloader@pdf.js/content/web/images/comment.svg b/browser/extensions/pdfjs/content/web/images/comment.svg similarity index 100% rename from browser/app/profile/extensions/uriloader@pdf.js/content/web/images/comment.svg rename to browser/extensions/pdfjs/content/web/images/comment.svg diff --git a/browser/app/profile/extensions/uriloader@pdf.js/content/web/images/document-print.svg b/browser/extensions/pdfjs/content/web/images/document-print.svg similarity index 100% rename from browser/app/profile/extensions/uriloader@pdf.js/content/web/images/document-print.svg rename to browser/extensions/pdfjs/content/web/images/document-print.svg diff --git a/browser/app/profile/extensions/uriloader@pdf.js/content/web/images/download.svg b/browser/extensions/pdfjs/content/web/images/download.svg similarity index 100% rename from browser/app/profile/extensions/uriloader@pdf.js/content/web/images/download.svg rename to browser/extensions/pdfjs/content/web/images/download.svg diff --git a/browser/app/profile/extensions/uriloader@pdf.js/content/web/images/go-down.svg b/browser/extensions/pdfjs/content/web/images/go-down.svg similarity index 100% rename from browser/app/profile/extensions/uriloader@pdf.js/content/web/images/go-down.svg rename to browser/extensions/pdfjs/content/web/images/go-down.svg diff --git a/browser/app/profile/extensions/uriloader@pdf.js/content/web/images/go-up.svg b/browser/extensions/pdfjs/content/web/images/go-up.svg similarity index 100% rename from browser/app/profile/extensions/uriloader@pdf.js/content/web/images/go-up.svg rename to browser/extensions/pdfjs/content/web/images/go-up.svg diff --git a/browser/app/profile/extensions/uriloader@pdf.js/content/web/images/loading-icon.gif b/browser/extensions/pdfjs/content/web/images/loading-icon.gif similarity index 100% rename from browser/app/profile/extensions/uriloader@pdf.js/content/web/images/loading-icon.gif rename to browser/extensions/pdfjs/content/web/images/loading-icon.gif diff --git a/browser/app/profile/extensions/uriloader@pdf.js/content/web/images/nav-outline.svg b/browser/extensions/pdfjs/content/web/images/nav-outline.svg similarity index 100% rename from browser/app/profile/extensions/uriloader@pdf.js/content/web/images/nav-outline.svg rename to browser/extensions/pdfjs/content/web/images/nav-outline.svg diff --git a/browser/app/profile/extensions/uriloader@pdf.js/content/web/images/nav-thumbs.svg b/browser/extensions/pdfjs/content/web/images/nav-thumbs.svg similarity index 100% rename from browser/app/profile/extensions/uriloader@pdf.js/content/web/images/nav-thumbs.svg rename to browser/extensions/pdfjs/content/web/images/nav-thumbs.svg diff --git a/browser/app/profile/extensions/uriloader@pdf.js/content/web/images/pin-down.svg b/browser/extensions/pdfjs/content/web/images/pin-down.svg similarity index 100% rename from browser/app/profile/extensions/uriloader@pdf.js/content/web/images/pin-down.svg rename to browser/extensions/pdfjs/content/web/images/pin-down.svg diff --git a/browser/app/profile/extensions/uriloader@pdf.js/content/web/images/pin-up.svg b/browser/extensions/pdfjs/content/web/images/pin-up.svg similarity index 100% rename from browser/app/profile/extensions/uriloader@pdf.js/content/web/images/pin-up.svg rename to browser/extensions/pdfjs/content/web/images/pin-up.svg diff --git a/browser/app/profile/extensions/uriloader@pdf.js/content/web/images/zoom-in.svg b/browser/extensions/pdfjs/content/web/images/zoom-in.svg similarity index 100% rename from browser/app/profile/extensions/uriloader@pdf.js/content/web/images/zoom-in.svg rename to browser/extensions/pdfjs/content/web/images/zoom-in.svg diff --git a/browser/app/profile/extensions/uriloader@pdf.js/content/web/images/zoom-out.svg b/browser/extensions/pdfjs/content/web/images/zoom-out.svg similarity index 100% rename from browser/app/profile/extensions/uriloader@pdf.js/content/web/images/zoom-out.svg rename to browser/extensions/pdfjs/content/web/images/zoom-out.svg diff --git a/browser/app/profile/extensions/uriloader@pdf.js/content/web/viewer-snippet-firefox-extension.html b/browser/extensions/pdfjs/content/web/viewer-snippet-firefox-extension.html similarity index 100% rename from browser/app/profile/extensions/uriloader@pdf.js/content/web/viewer-snippet-firefox-extension.html rename to browser/extensions/pdfjs/content/web/viewer-snippet-firefox-extension.html diff --git a/browser/app/profile/extensions/uriloader@pdf.js/content/web/viewer.css b/browser/extensions/pdfjs/content/web/viewer.css similarity index 100% rename from browser/app/profile/extensions/uriloader@pdf.js/content/web/viewer.css rename to browser/extensions/pdfjs/content/web/viewer.css diff --git a/browser/app/profile/extensions/uriloader@pdf.js/content/web/viewer.html b/browser/extensions/pdfjs/content/web/viewer.html similarity index 100% rename from browser/app/profile/extensions/uriloader@pdf.js/content/web/viewer.html rename to browser/extensions/pdfjs/content/web/viewer.html diff --git a/browser/app/profile/extensions/uriloader@pdf.js/content/web/viewer.js b/browser/extensions/pdfjs/content/web/viewer.js similarity index 100% rename from browser/app/profile/extensions/uriloader@pdf.js/content/web/viewer.js rename to browser/extensions/pdfjs/content/web/viewer.js diff --git a/browser/app/profile/extensions/uriloader@pdf.js/extension-files b/browser/extensions/pdfjs/extension-files similarity index 100% rename from browser/app/profile/extensions/uriloader@pdf.js/extension-files rename to browser/extensions/pdfjs/extension-files diff --git a/browser/app/profile/extensions/uriloader@pdf.js/icon.png b/browser/extensions/pdfjs/icon.png similarity index 100% rename from browser/app/profile/extensions/uriloader@pdf.js/icon.png rename to browser/extensions/pdfjs/icon.png diff --git a/browser/app/profile/extensions/uriloader@pdf.js/icon64.png b/browser/extensions/pdfjs/icon64.png similarity index 100% rename from browser/app/profile/extensions/uriloader@pdf.js/icon64.png rename to browser/extensions/pdfjs/icon64.png diff --git a/browser/app/profile/extensions/uriloader@pdf.js/install.rdf.in b/browser/extensions/pdfjs/install.rdf.in similarity index 100% rename from browser/app/profile/extensions/uriloader@pdf.js/install.rdf.in rename to browser/extensions/pdfjs/install.rdf.in diff --git a/browser/app/profile/extensions/uriloader@pdf.js/test/Makefile.in b/browser/extensions/pdfjs/test/Makefile.in similarity index 84% rename from browser/app/profile/extensions/uriloader@pdf.js/test/Makefile.in rename to browser/extensions/pdfjs/test/Makefile.in index b609ef8f4f2..56c0149b7da 100644 --- a/browser/app/profile/extensions/uriloader@pdf.js/test/Makefile.in +++ b/browser/extensions/pdfjs/test/Makefile.in @@ -2,11 +2,11 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = ../../../../../.. +DEPTH = ../../../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -relativesrcdir = browser/app/profile/extensions/uriloader@pdf.js/test +relativesrcdir = browser/features/pdfjs/test include $(DEPTH)/config/autoconf.mk include $(topsrcdir)/config/rules.mk diff --git a/browser/app/profile/extensions/uriloader@pdf.js/test/browser_pdfjs_main.js b/browser/extensions/pdfjs/test/browser_pdfjs_main.js similarity index 67% rename from browser/app/profile/extensions/uriloader@pdf.js/test/browser_pdfjs_main.js rename to browser/extensions/pdfjs/test/browser_pdfjs_main.js index 706eefa853e..d37fd7acd28 100644 --- a/browser/app/profile/extensions/uriloader@pdf.js/test/browser_pdfjs_main.js +++ b/browser/extensions/pdfjs/test/browser_pdfjs_main.js @@ -2,25 +2,12 @@ * http://creativecommons.org/publicdomain/zero/1.0/ */ -const RELATIVE_DIR = "browser/app/profile/extensions/uriloader@pdf.js/test/"; +const RELATIVE_DIR = "browser/features/pdfjs/test/"; const TESTROOT = "http://example.com/browser/" + RELATIVE_DIR; function test() { waitForExplicitFinish(); - AddonManager.getAddonByID("uriloader@pdf.js", function(aAddon) { - is(aAddon.userDisabled, true, 'Pdf.js addon must be disabled by default'); - aAddon.userDisabled = false; - - registerCleanupFunction(function() { - aAddon.userDisabled = true; - }); - - continueTest(); - }); -} - -function continueTest() { var tab = gBrowser.addTab(TESTROOT + "file_pdfjs_test.pdf"); var newTabBrowser = gBrowser.getBrowserForTab(tab); newTabBrowser.addEventListener("load", function onLoad() { diff --git a/browser/app/profile/extensions/uriloader@pdf.js/test/file_pdfjs_test.pdf b/browser/extensions/pdfjs/test/file_pdfjs_test.pdf similarity index 100% rename from browser/app/profile/extensions/uriloader@pdf.js/test/file_pdfjs_test.pdf rename to browser/extensions/pdfjs/test/file_pdfjs_test.pdf diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in index 2747a3d7044..53dc75fafc0 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -480,9 +480,10 @@ ; [Browser Chrome Files] @BINPATH@/chrome/browser@JAREXT@ @BINPATH@/chrome/browser.manifest ++@BINPATH@/chrome/pdfjs/* ++@BINPATH@/chrome/pdfjs.manifest @BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf @BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png -@BINPATH@/extensions/uriloader@pdf.js.xpi #ifdef SHIP_FEEDBACK @BINPATH@/distribution/extensions/testpilot@labs.mozilla.com.xpi #endif