Merge pull request #3801 from Rob--W/hotfix/crx-ubuntu

chrome.extension -> chrome.runtime for Ubuntu
This commit is contained in:
Jonas Jenwald 2013-10-13 13:27:28 -07:00
commit d153341927
2 changed files with 5 additions and 5 deletions

View File

@ -19,7 +19,7 @@ limitations under the License.
'use strict';
var VIEWER_URL = chrome.extension.getURL('content/web/viewer.html');
var VIEWER_URL = chrome.runtime.getURL('content/web/viewer.html');
var BASE_URL = VIEWER_URL.replace(/[^\/]+$/, '');
function getViewerURL(pdf_url) {
@ -72,7 +72,7 @@ function replaceDocumentWithViewer(url) {
// the correct permissions. Fix it:
script = document.createElement('script');
script.onload = loadNextScript;
script.src = chrome.extension.getURL('patch-worker.js');
script.src = chrome.runtime.getURL('patch-worker.js');
scripts.push(script);
while (x.response.scripts.length) {
@ -132,10 +132,10 @@ function renderPDF(url) {
// Activate the content script only once per frame (until reload)
if (!window.hasRun) {
window.hasRun = true;
chrome.extension.onMessage.addListener(function listener(message) {
chrome.runtime.onMessage.addListener(function listener(message) {
if (message && message.type === 'showPDFViewer' &&
message.url === location.href) {
chrome.extension.onMessage.removeListener(listener);
chrome.runtime.onMessage.removeListener(listener);
showViewer(message.url);
}
});

View File

@ -55,7 +55,7 @@ chrome.webRequest.onBeforeRequest.addListener(
return; // Doesn't work in incognito mode, so don't redirect.
var viewerPage = 'content/web/viewer.html';
var url = chrome.extension.getURL(viewerPage) +
var url = chrome.runtime.getURL(viewerPage) +
'?file=' + encodeURIComponent(details.url);
return { redirectUrl: url };
},