From 9cf2c92c3ecdb06ae68571ae4bcee2f95f3bf5bf Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Thu, 25 Apr 2019 07:50:52 -0400 Subject: Remove UpdateChannel.jsm --- toolkit/modules/UpdateChannel.jsm | 47 --------------------------------------- toolkit/modules/moz.build | 1 - 2 files changed, 48 deletions(-) delete mode 100644 toolkit/modules/UpdateChannel.jsm (limited to 'toolkit/modules') diff --git a/toolkit/modules/UpdateChannel.jsm b/toolkit/modules/UpdateChannel.jsm deleted file mode 100644 index c2bdce8ad..000000000 --- a/toolkit/modules/UpdateChannel.jsm +++ /dev/null @@ -1,47 +0,0 @@ -#filter substitution - -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -this.EXPORTED_SYMBOLS = ["UpdateChannel"]; - -const Cu = Components.utils; - -Cu.import("resource://gre/modules/Services.jsm"); - -this.UpdateChannel = { - /** - * Read the update channel from defaults only. We do this to ensure that - * the channel is tightly coupled with the application and does not apply - * to other instances of the application that may use the same profile. - * - * @param [optional] aIncludePartners - * Whether or not to include the partner bits. Default: true. - */ - get: function UpdateChannel_get(aIncludePartners = true) { - let channel = "@MOZ_UPDATE_CHANNEL@"; - let defaults = Services.prefs.getDefaultBranch(null); - try { - channel = defaults.getCharPref("app.update.channel"); - } catch (e) { - // use default value when pref not found - } - - if (aIncludePartners) { - try { - let partners = Services.prefs.getChildList("app.partner.").sort(); - if (partners.length) { - channel += "-cck"; - partners.forEach(function (prefName) { - channel += "-" + Services.prefs.getCharPref(prefName); - }); - } - } catch (e) { - Cu.reportError(e); - } - } - - return channel; - } -}; diff --git a/toolkit/modules/moz.build b/toolkit/modules/moz.build index ba71a5a3c..4e647bd7f 100644 --- a/toolkit/modules/moz.build +++ b/toolkit/modules/moz.build @@ -102,7 +102,6 @@ EXTRA_JS_MODULES.sessionstore += ['sessionstore/Utils.jsm'] EXTRA_PP_JS_MODULES += [ 'NewTabUtils.jsm', 'Troubleshoot.jsm', - 'UpdateChannel.jsm', 'UpdateUtils.jsm', ] -- cgit v1.2.3