Merge pull request mozilla#1901 from brendandahl/ff16_sync

Sync up a few files with mozcentral. Address mozcentral review comments.
joehom0416 · Jul 14, 2012 · 2965bad · 2965bad
2 parents 9c012f8 + f16c6f1
commit 2965bad
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/extensions/firefox/components/PdfStreamConverter.js b/extensions/firefox/components/PdfStreamConverter.js
@@ -132,16 +132,13 @@ ChromeActions.prototype = {
     var originalUrl = data.originalUrl;
     // The data may not be downloaded so we need just retry getting the pdf with
     // the original url.
-    var blobUrl = data.blobUrl || originalUrl;
-    var originalUri = NetUtil.newURI(originalUrl);
-    var blobUri = NetUtil.newURI(blobUrl);
+    var originalUri = NetUtil.newURI(data.originalUrl);
+    var blobUri = data.blobUrl ? NetUtil.newURI(data.blobUrl) : originalUri;
     var extHelperAppSvc =
           Cc['@mozilla.org/uriloader/external-helper-app-service;1'].
              getService(Ci.nsIExternalHelperAppService);
     var frontWindow = Cc['@mozilla.org/embedcomp/window-watcher;1'].
                          getService(Ci.nsIWindowWatcher).activeWindow;
-    var ioService = Services.io;
-    var channel = ioService.newChannel(originalUrl, null, null);
 
     NetUtil.asyncFetch(blobUri, function(aInputStream, aResult) {
       if (!Components.isSuccessCode(aResult)) {

diff --git a/l10n/en-US/chrome.properties b/l10n/en-US/chrome.properties
@@ -1,3 +1,4 @@
 # Chrome notification bar messages and buttons
 unsupported_feature=This PDF document might not be displayed correctly.
 open_with_different_viewer=Open With Different Viewer
+open_with_different_viewer.accessKey=o
diff --git a/test/mozcentral/Makefile.in b/test/mozcentral/Makefile.in
@@ -9,13 +9,11 @@ VPATH     = @srcdir@
 relativesrcdir  = browser/extensions/pdfjs/test
 
 include $(DEPTH)/config/autoconf.mk
-include $(topsrcdir)/config/rules.mk
 
-_BROWSER_TEST_FILES = \
+MOCHITEST_BROWSER_FILES = \
   browser_pdfjs_main.js \
   browser_pdfjs_savedialog.js \
   file_pdfjs_test.pdf \
   $(NULL)
 
-libs:: $(_BROWSER_TEST_FILES)
-	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir) 
+include $(topsrcdir)/config/rules.mk