Bug 836451 - Add distribution info to about:firefox, r=margaret

mobile/android/chrome/content/about.xhtml

@@ -28,7 +28,7 @@
   </div>
 
   <div id="banner">
-    <div id="logo"></div>
+    <div id="logo"/>
 #ifdef MOZ_UPDATER
     <div id="updateBox">
       <a id="updateLink" href="" onclick="checkForUpdates();">&aboutPage.checkForUpdates.link;</a>
@@ -38,14 +38,17 @@
     </div>
 #endif
 
-    <div id="aboutTelemetry" hidden="true">
-      <p id="telemetry">
+    <div id="messages">
+      <p id="distributionAbout" hidden="true"/>
+      <p id="distributionID" hidden="true"/>
+      <p id="telemetry" hidden="true">
         &aboutPage.warningVersion;
 #ifdef MOZ_TELEMETRY_ON_BY_DEFAULT
         &aboutPage.telemetryStart;<a href="http://www.mozilla.org/">&aboutPage.telemetryMozillaLink;</a>&aboutPage.telemetryEnd;
 #endif
       </p>
     </div>
+
   </div>
 
     <ul id="aboutLinks">
@@ -80,7 +83,25 @@
         versionPara.appendChild(br);
         let date = document.createTextNode("(" + buildDate + ")");
         versionPara.appendChild(date);
-        document.getElementById("aboutTelemetry").hidden = false;
+        document.getElementById("telemetry").hidden = false;
+      }
+
+      // Include the Distribution information if available
+      try {
+        let distroId = Services.prefs.getCharPref("distribution.id");
+        if (distroId) {
+          let distroVersion = Services.prefs.getCharPref("distribution.version");
+          let distroIdField = document.getElementById("distributionID");
+          distroIdField.textContent = distroId + " - " + distroVersion;
+          distroIdField.hidden = false;
+
+          let distroAbout = Services.prefs.getComplexValue("distribution.about", Ci.nsISupportsString);
+          let distroField = document.getElementById("distributionAbout");
+          distroField.textContent = distroAbout;
+          distroField.hidden = false;
+        }
+      } catch (e) {
+        // Pref is unset
       }
 
       // get URLs from prefs

mobile/android/themes/core/aboutPage.css

@@ -63,7 +63,7 @@ body {
   display: none;
 }
 
-#aboutTelemetry {
+#messages {
   position: relative;
   width: 70%;
   margin: 40px auto 0 auto;
@@ -72,7 +72,7 @@ body {
   text-align: center;
 }
 
-#aboutTelemetry  a {
+#telemetry a {
   text-decoration: underline;
 }