Bug 1171677 - Part 2. Safe mode in about:support. r=MattN

toolkit/content/aboutSupport.js

@@ -47,6 +47,8 @@ let snapshotFormatters = {
 
     $("multiprocess-box").textContent = stringBundle().formatStringFromName("multiProcessStatus",
       [data.numRemoteWindows, data.numTotalWindows, data.remoteAutoStart], 3);
+
+    $("safemode-box").textContent = data.safeMode;
   },
 
 #ifdef MOZ_CRASHREPORTER

toolkit/content/aboutSupport.xhtml

@@ -207,6 +207,15 @@
             </td>
           </tr>
 
+          <tr>
+            <th class="column">
+              &aboutSupport.appBasicsSafeMode;
+            </th>
+
+            <td id="safemode-box">
+            </td>
+          </tr>
+
         </tbody>
       </table>
 

toolkit/locales/en-US/chrome/global/aboutSupport.dtd

@@ -61,6 +61,8 @@ Windows/Mac use the term "Folder" instead of "Directory" -->
 
 <!ENTITY aboutSupport.appBasicsMultiProcessSupport "Multiprocess Windows">
 
+<!ENTITY aboutSupport.appBasicsSafeMode "Safe Mode">
+
 <!ENTITY aboutSupport.showDir.label "Open Directory">
 <!-- LOCALIZATION NOTE (aboutSupport.showMac.label): This is the Mac-specific
 variant of aboutSupport.showDir.label.  This allows us to use the preferred

toolkit/modules/Troubleshoot.jsm

@@ -177,6 +177,7 @@ let dataProviders = {
       userAgent: Cc["@mozilla.org/network/protocol;1?name=http"].
                  getService(Ci.nsIHttpProtocolHandler).
                  userAgent,
+      safeMode: Services.appinfo.inSafeMode,
     };
 
     if (AppConstants.MOZ_UPDATER)

toolkit/modules/tests/browser/browser_Troubleshoot.js

@@ -131,6 +131,9 @@ const SNAPSHOT_SCHEMA = {
         numRemoteWindows: {
           type: "number",
         },
+        safeMode: {
+          type: "boolean",
+        },
       },
     },
     crashes: {