[CRX] Clean up file/ftp handler

Merge ftp and file handler now their implementations are identical.
Remove redundant comment (the referenced Chrome bug has been fixed
a long time ago - https://crbug.com/302548 ).
This commit is contained in:
Rob Wu 2018-01-26 13:13:18 +01:00
parent 85378fc982
commit 838573abd4

View File

@ -140,32 +140,12 @@ chrome.webRequest.onHeadersReceived.addListener(
}, },
['blocking', 'responseHeaders']); ['blocking', 'responseHeaders']);
chrome.webRequest.onBeforeRequest.addListener(
function onBeforeRequestForFTP(details) {
if (isPdfDownloadable(details)) {
return;
}
var viewerUrl = getViewerURL(details.url);
return { redirectUrl: viewerUrl, };
},
{
urls: [
'ftp://*/*.pdf',
'ftp://*/*.PDF'
],
types: ['main_frame', 'sub_frame'],
},
['blocking']);
chrome.webRequest.onBeforeRequest.addListener( chrome.webRequest.onBeforeRequest.addListener(
function(details) { function(details) {
if (isPdfDownloadable(details)) { if (isPdfDownloadable(details)) {
return; return;
} }
// NOTE: The manifest file has declared an empty content script
// at file://*/* to make sure that the viewer can load the PDF file
// through XMLHttpRequest. Necessary to deal with http://crbug.com/302548
var viewerUrl = getViewerURL(details.url); var viewerUrl = getViewerURL(details.url);
return { redirectUrl: viewerUrl, }; return { redirectUrl: viewerUrl, };
@ -173,7 +153,9 @@ chrome.webRequest.onBeforeRequest.addListener(
{ {
urls: [ urls: [
'file://*/*.pdf', 'file://*/*.pdf',
'file://*/*.PDF' 'file://*/*.PDF',
'ftp://*/*.pdf',
'ftp://*/*.PDF',
], ],
types: ['main_frame', 'sub_frame'], types: ['main_frame', 'sub_frame'],
}, },