Merge m-c to autoland. a=merge on a CLOSED TREE
authorRyan VanderMeulen <ryanvm@gmail.com>
Thu, 26 Apr 2018 08:48:42 -0400
changeset 469268 0be8ef04ed899478df11701f8fe23b839bbbdabd
parent 469267 56084ee1029acf0a608eb8122d5451354ddee7fd (current diff)
parent 469230 2885667acedbfaa2ce362128ca8fd2c45ea08ade (diff)
child 469292 480cf7fe96670d904b0c99d72b4d0e5beb1221cf
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 m-c to autoland. a=merge on a 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
@@ -54,17 +54,17 @@ let extensionControlledContentIds = {
           "trackingProtectionExtensionContentLabel" :
           "trackingProtectionPBMExtensionContentLabel",
     };
   }
 };
 
 function getExtensionControlledArgs(settingName) {
   switch (settingName) {
-    case "proxyConfig":
+    case "proxy.settings":
       return [document.getElementById("bundleBrand").getString("brandShortName")];
     default:
       return [];
   }
 }
 
 let extensionControlledIds = {};