diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-03-06 12:30:20 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-03-06 12:30:20 +0100 |
| commit | e25ad543952b5afc13181aaebef9c5951fc27be0 (patch) | |
| tree | 456a1359b3e5f810319edd423dd5cc5a1e22ada5 /toolkit/components/blocklist/nsBlocklistService.js | |
| parent | 74533a843277c3687c749989ed1522354d1054d2 (diff) | |
| parent | 5dba1ebe8498286762873fff0016f35f3e14d2d5 (diff) | |
| download | UXP-2019.03.08.tar UXP-2019.03.08.tar.gz UXP-2019.03.08.tar.lz UXP-2019.03.08.tar.xz UXP-2019.03.08.zip | |
Merge branch 'master' into Basilisk-releasev2019.03.08
Diffstat (limited to 'toolkit/components/blocklist/nsBlocklistService.js')
| -rw-r--r-- | toolkit/components/blocklist/nsBlocklistService.js | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/toolkit/components/blocklist/nsBlocklistService.js b/toolkit/components/blocklist/nsBlocklistService.js index 891346b72..1cd2ed806 100644 --- a/toolkit/components/blocklist/nsBlocklistService.js +++ b/toolkit/components/blocklist/nsBlocklistService.js @@ -24,13 +24,8 @@ try { XPCOMUtils.defineLazyModuleGetter(this, "FileUtils", "resource://gre/modules/FileUtils.jsm"); -#ifdef MOZ_WEBEXTENSIONS -XPCOMUtils.defineLazyModuleGetter(this, "UpdateUtils", - "resource://gre/modules/UpdateUtils.jsm"); -#else XPCOMUtils.defineLazyModuleGetter(this, "UpdateChannel", "resource://gre/modules/UpdateChannel.jsm"); -#endif XPCOMUtils.defineLazyModuleGetter(this, "OS", "resource://gre/modules/osfile.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "ServiceRequest", @@ -571,11 +566,7 @@ Blocklist.prototype = { dsURI = dsURI.replace(/%BUILD_TARGET%/g, gApp.OS + "_" + gABI); dsURI = dsURI.replace(/%OS_VERSION%/g, gOSVersion); dsURI = dsURI.replace(/%LOCALE%/g, getLocale()); -#ifdef MOZ_WEBEXTENSIONS - dsURI = dsURI.replace(/%CHANNEL%/g, UpdateUtils.UpdateChannel); -#else dsURI = dsURI.replace(/%CHANNEL%/g, UpdateChannel.get()); -#endif dsURI = dsURI.replace(/%PLATFORM_VERSION%/g, gApp.platformVersion); dsURI = dsURI.replace(/%DISTRIBUTION%/g, getDistributionPrefValue(PREF_APP_DISTRIBUTION)); |