Merge mozilla-central to autoland. a=merge CLOSED TREE
authorCiure Andrei <aciure@mozilla.com>
Thu, 26 Apr 2018 12:19:43 +0300
changeset 469258 a0346595283ca86fd8fe1cbb0d9d99f18660b8eb
parent 469257 30abe52251ba22ccd5f6b674c7c41d3a6be25963 (current diff)
parent 469229 8d85e4da25463ccdcf902ac5a846773b8b642553 (diff)
child 469259 411dfa0e714afdf06524dc2590c53263362a9fea
push id9165
push userasasaki@mozilla.com
push dateThu, 26 Apr 2018 21:04:54 +0000
treeherdermozilla-beta@064c3804de2e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmerge
milestone61.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge mozilla-central to autoland. a=merge CLOSED TREE
browser/components/preferences/in-content/extensionControlled.js
--- a/browser/components/preferences/in-content/extensionControlled.js
+++ b/browser/components/preferences/in-content/extensionControlled.js
@@ -55,23 +55,22 @@ let extensionControlledContentIds = {
           "trackingProtectionPBMExtensionContentLabel",
     };
   }
 };
 
 function getExtensionControlledArgs(settingName) {
   switch (settingName) {
     case "proxyConfig":
-      return [document.getElementById("bundleBrand").getString("brandShortName$
+      return [document.getElementById("bundleBrand").getString("brandShortName")];
     default:
       return [];
   }
 }
 
-
 let extensionControlledIds = {};
 
 /**
   * Check if a pref is being managed by an extension.
   */
 async function getControllingExtensionInfo(type, settingName) {
   await ExtensionSettingsStore.initialize();
   return ExtensionSettingsStore.getSetting(type, settingName);