Merge branch 'master' of github.com:mozilla/pdf.js into fallback-ui

Conflicts:
	extensions/firefox/components/PdfStreamConverter.js

diff --cc extensions/firefox/components/PdfStreamConverter.js
index 550fbf2713754c6316f4ec0ca59a7fa4af1b599b,2c984e86cd19c216f41b86f6f88056498799d5aa..2e7ab56e86719665cbd37caf74d881e592241f39
--- 1/extensions/firefox/components/PdfStreamConverter.js
--- 2/extensions/firefox/components/PdfStreamConverter.js
+++ b/extensions/firefox/components/PdfStreamConverter.js
@@@ -168,28 -160,7 +167,28 @@@ ChromeActions.prototype = 
      }
    },
    pdfBugEnabled: function() {
-     return getBoolPref(EXT_PREFIX + '.pdfBugEnabled', false);
+     return getBoolPref(PREF_PREFIX + '.pdfBugEnabled', false);
 +  },
 +  fallback: function(url) {
 +    var self = this;
 +    var domWindow = this.domWindow;
 +    var strings = getLocalizedStrings('chrome.properties');
 +    var message = getLocalizedString(strings, 'unsupported_feature');
 +
 +    var win = Services.wm.getMostRecentWindow('navigator:browser');
 +    var browser = win.gBrowser.getBrowserForDocument(domWindow.top.document);
 +    var notificationBox = win.gBrowser.getNotificationBox(browser);
 +
 +    var buttons = [{
 +      label: getLocalizedString(strings, 'open_with_different_viewer'),
 +      accessKey: null,
 +      callback: function() {
 +        self.download(url);
 +      }
 +    }];
 +    notificationBox.appendNotification(message, 'pdfjs-fallback', null,
 +                                       notificationBox.PRIORITY_WARNING_LOW,
 +                                       buttons);
    }
  };
  

diff --cc make.js
index 955c94b077f2683924f938423d18ada5ed9770c2,e5202b296a7c6e1f8d142def9b82d3d65190e52e..9a77f2575c17fda345deb4b65cd2f8a001023520
--- 1/make.js
--- 2/make.js
+++ b/make.js
@@@ -395,13 -398,9 +402,10 @@@ target.mozcentral = function() 
           'components',
           '../../LICENSE'],
        DEFAULT_LOCALE_FILES =
 -        [LOCALE_SRC_DIR + 'en-US/viewer.properties'],
 +        [LOCALE_SRC_DIR + 'en-US/viewer.properties',
 +         LOCALE_SRC_DIR + 'en-US/chrome.properties'],
        FIREFOX_MC_EXTENSION_FILES =
-         ['bootstrap.js',
-          'icon.png',
-          'icon64.png',
-          'chrome.manifest',
+         ['chrome.manifest',
           'components',
           'content',
           'LICENSE'];

diff --cc src/api.js
Simple merge

diff --cc src/core.js
Simple merge

diff --cc src/evaluator.js
Simple merge

diff --cc src/fonts.js
Simple merge

diff --cc src/util.js
Simple merge

diff --cc src/worker.js
Simple merge

diff --cc web/viewer.js
Simple merge