Bug 474043 - Part 5 - Remove the json suffix from nsHandlerService. r=Paolo

MozReview-Commit-ID: C7H7VlYO25i

--HG--
rename : uriloader/exthandler/nsHandlerService-json.js => uriloader/exthandler/HandlerService.js
rename : uriloader/exthandler/nsHandlerService-json.manifest => uriloader/exthandler/HandlerService.manifest
extra : rebase_source : b27f3134ec035b9c2fa846c0b6152e65afeb2b7c
This commit is contained in:
Marco Bonardo 2018-03-15 14:44:00 +01:00
parent 42c4dcae3e
commit 014fcdedcd
6 changed files with 8 additions and 8 deletions

View File

@ -925,7 +925,7 @@ BrowserGlue.prototype = {
_onFirstWindowLoaded: function BG__onFirstWindowLoaded(aWindow) {
// Set up listeners and, if PdfJs is enabled, register the PDF stream converter.
// We delay all of the parent's initialization other than stream converter
// registration, because it requires file IO from nsHandlerService-json.js
// registration, because it requires file IO from HandlerService.js
Services.ppmm.loadProcessScript("resource://pdf.js/pdfjschildbootstrap.js", true);
if (PdfJs.enabled) {
PdfJs.ensureRegistered();

View File

@ -455,8 +455,8 @@
@RESPATH@/components/ContentPrefService2.js
@RESPATH@/components/nsContentDispatchChooser.manifest
@RESPATH@/components/nsContentDispatchChooser.js
@RESPATH@/components/nsHandlerService-json.manifest
@RESPATH@/components/nsHandlerService-json.js
@RESPATH@/components/HandlerService.manifest
@RESPATH@/components/HandlerService.js
@RESPATH@/components/nsWebHandlerApp.manifest
@RESPATH@/components/nsWebHandlerApp.js
@RESPATH@/components/satchel.manifest

View File

@ -328,8 +328,8 @@
@BINPATH@/components/txEXSLTRegExFunctions.js
@BINPATH@/components/ContentPrefService2.manifest
@BINPATH@/components/ContentPrefService2.js
@BINPATH@/components/nsHandlerService-json.manifest
@BINPATH@/components/nsHandlerService-json.js
@BINPATH@/components/HandlerService.manifest
@BINPATH@/components/HandlerService.js
@BINPATH@/components/nsWebHandlerApp.manifest
@BINPATH@/components/nsWebHandlerApp.js
@BINPATH@/components/satchel.manifest

View File

@ -1,2 +1,2 @@
component {220cc253-b60f-41f6-b9cf-fdcb325f970f} nsHandlerService-json.js
component {220cc253-b60f-41f6-b9cf-fdcb325f970f} HandlerService.js
contract @mozilla.org/uriloader/handler-service;1 {220cc253-b60f-41f6-b9cf-fdcb325f970f} process=main

View File

@ -106,8 +106,8 @@ if CONFIG['MOZ_ENABLE_DBUS']:
]
EXTRA_COMPONENTS += [
'nsHandlerService-json.js',
'nsHandlerService-json.manifest',
'HandlerService.js',
'HandlerService.manifest',
'nsWebHandlerApp.js',
'nsWebHandlerApp.manifest',
]