From 27ba2c13dfba0343c5b20aedfefbb96de89c3ff3 Mon Sep 17 00:00:00 2001
From: "Bernardo P. Rittmeyer" <bernardo@rittme.com>
Date: Thu, 5 Jun 2014 02:47:00 +1200
Subject: [PATCH] Bug 804430 - Added list of whitelisted locked prefs to
 about:support. r=Unfocused

---
 toolkit/content/aboutSupport.js               | 11 ++++++++++
 toolkit/content/aboutSupport.xhtml            | 21 +++++++++++++++++++
 .../en-US/chrome/global/aboutSupport.dtd      |  4 ++++
 toolkit/modules/Troubleshoot.jsm              | 21 +++++++++++++++++++
 4 files changed, 57 insertions(+)

diff --git a/toolkit/content/aboutSupport.js b/toolkit/content/aboutSupport.js
index bd7cb708863..77986e0ce28 100644
--- a/toolkit/content/aboutSupport.js
+++ b/toolkit/content/aboutSupport.js
@@ -148,6 +148,17 @@ let snapshotFormatters = {
     ));
   },
 
+  lockedPreferences: function lockedPreferences(data) {
+    $.append($("locked-prefs-tbody"), sortedArrayFromObject(data).map(
+      function ([name, value]) {
+        return $.new("tr", [
+          $.new("td", name, "pref-name"),
+          $.new("td", String(value).substr(0, 120), "pref-value"),
+        ]);
+      }
+    ));
+  },
+
   graphics: function graphics(data) {
     // graphics-info-properties tbody
     if ("info" in data) {
diff --git a/toolkit/content/aboutSupport.xhtml b/toolkit/content/aboutSupport.xhtml
index 99350e8925b..753a8283b90 100644
--- a/toolkit/content/aboutSupport.xhtml
+++ b/toolkit/content/aboutSupport.xhtml
@@ -263,6 +263,27 @@
         <p>&aboutSupport.userJSDescription;</p>
       </section>
 
+      <!-- - - - - - - - - - - - - - - - - - - - - -->
+
+      <h2 class="major-section">
+        &aboutSupport.lockedKeyPrefsTitle;
+      </h2>
+
+      <table class="prefs-table">
+        <thead class="no-copy">
+          <th class="name">
+            &aboutSupport.lockedPrefsName;
+          </th>
+
+          <th class="value">
+            &aboutSupport.lockedPrefsValue;
+          </th>
+        </thead>
+
+        <tbody id="locked-prefs-tbody">
+        </tbody>
+      </table>
+
       <!-- - - - - - - - - - - - - - - - - - - - - -->
       <h2 class="major-section">
         &aboutSupport.jsTitle;
diff --git a/toolkit/locales/en-US/chrome/global/aboutSupport.dtd b/toolkit/locales/en-US/chrome/global/aboutSupport.dtd
index 57d8f40da7d..dae675cef32 100644
--- a/toolkit/locales/en-US/chrome/global/aboutSupport.dtd
+++ b/toolkit/locales/en-US/chrome/global/aboutSupport.dtd
@@ -71,6 +71,10 @@ variant of aboutSupport.showDir.label. -->
 <!ENTITY aboutSupport.userJSTitle "user.js Preferences">
 <!ENTITY aboutSupport.userJSDescription "Your profile folder contains a <a id='prefs-user-js-link'>user.js file</a>, which includes preferences that were not created by &brandShortName;.">
 
+<!ENTITY aboutSupport.lockedKeyPrefsTitle "Important Locked Preferences">
+<!ENTITY aboutSupport.lockedPrefsName "Name">
+<!ENTITY aboutSupport.lockedPrefsValue "Value">
+
 <!ENTITY aboutSupport.graphicsTitle "Graphics">
 
 <!ENTITY aboutSupport.jsTitle "JavaScript">
diff --git a/toolkit/modules/Troubleshoot.jsm b/toolkit/modules/Troubleshoot.jsm
index 1d72f5f552d..ce097d8f989 100644
--- a/toolkit/modules/Troubleshoot.jsm
+++ b/toolkit/modules/Troubleshoot.jsm
@@ -214,6 +214,27 @@ let dataProviders = {
     }, {}));
   },
 
+  lockedPreferences: function lockedPreferences(done) {
+    function getPref(name) {
+      let table = {};
+      table[Ci.nsIPrefBranch.PREF_STRING] = "getCharPref";
+      table[Ci.nsIPrefBranch.PREF_INT] = "getIntPref";
+      table[Ci.nsIPrefBranch.PREF_BOOL] = "getBoolPref";
+      let type = Services.prefs.getPrefType(name);
+      if (!(type in table))
+        throw new Error("Unknown preference type " + type + " for " + name);
+      return Services.prefs[table[type]](name);
+    }
+    done(PREFS_WHITELIST.reduce(function (prefs, branch) {
+      Services.prefs.getChildList(branch).forEach(function (name) {
+        if (Services.prefs.prefIsLocked(name) &&
+            !PREFS_BLACKLIST.some(function (re) re.test(name)))
+          prefs[name] = getPref(name);
+      });
+      return prefs;
+    }, {}));
+  },
+
   graphics: function graphics(done) {
     function statusMsgForFeature(feature) {
       // We return an array because in the tryNewerDriver case we need to