Bug 927402: Ensure that about:telemetry correctly reflects whether or not telemetry is turned on. r=jimm a=metro-only
authorStephen Pohl <spohl.mozilla.bugs@gmail.com>
Thu, 16 Jan 2014 09:37:14 -0500
changeset 175918 748a06e03145ce87b6c21cb0854f3148c09ee6ba
parent 175917 6e306ae9e1cb86e675bc4f105f84adf5582c907d
child 175919 71a8786c381580eed1e02c8e2f27d1689d6a1c32
push id445
push userffxbld
push dateMon, 10 Mar 2014 22:05:19 +0000
treeherdermozilla-release@dc38b741b04e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjimm, metro-only
bugs927402
milestone28.0a2
Bug 927402: Ensure that about:telemetry correctly reflects whether or not telemetry is turned on. r=jimm a=metro-only
browser/metro/base/content/browser.xul
browser/metro/profile/metro.js
--- a/browser/metro/base/content/browser.xul
+++ b/browser/metro/base/content/browser.xul
@@ -679,17 +679,23 @@ Desktop browser's sync prefs.
                  type="bool"
                  title="&optionsHeader.reporting.crashes.label;" />
         <setting pref="app.crashreporter.submitURLs"
                  id="prefs-reporting-submitURLs"
                  type="bool"
                  title="&optionsHeader.reporting.crashes.submitURLs;" />
       </settings>
       <settings id="prefs-telemetry" label="&optionsHeader.telemetry.title;">
-        <setting pref="toolkit.telemetry.enabled" type="bool" title="&optionsHeader.telemetry.label;"/>
+        <setting
+#ifdef MOZ_TELEMETRY_ON_BY_DEFAULT
+          pref="toolkit.telemetry.enabledPreRelease"
+#else
+          pref="toolkit.telemetry.enabled"
+#endif
+          type="bool" title="&optionsHeader.telemetry.label;"/>
       </settings>
       <settings id="prefs-dnt" label="&doNotTrack.title;">
         <setting id="prefs-dnt-value" pref="privacy.donottrackheader.value" type="radio" >
           <radiogroup id="prefs-dnt-options">
             <radio id="prefs-dnt-notrack" class="flyoutpanel-hack"
                    label="&doNotTrack.options.doNotTrack;" value="1"/>
             <radio id="prefs-dnt-oktrack" class="flyoutpanel-hack"
                    label="&doNotTrack.options.doTrack;" value="0"/>
--- a/browser/metro/profile/metro.js
+++ b/browser/metro/profile/metro.js
@@ -81,17 +81,21 @@ pref("toolkit.browser.contentViewExpire"
 
 
 pref("toolkit.defaultChromeURI", "chrome://browser/content/browser.xul");
 pref("browser.chromeURL", "chrome://browser/content/");
 
 pref("browser.tabs.remote", false);
 
 // Telemetry
+#ifdef MOZ_TELEMETRY_ON_BY_DEFAULT
+pref("toolkit.telemetry.enabledPreRelease", true);
+#else
 pref("toolkit.telemetry.enabled", true);
+#endif
 pref("toolkit.telemetry.prompted", 2);
 
 pref("toolkit.screen.lock", false);
 
 // From libpref/src/init/all.js. Disabling text zoom in favor of APZ zoom. See bug 936940.
 pref("zoom.minPercent", 100);
 pref("zoom.maxPercent", 100);
 pref("toolkit.zoomManager.zoomValues", "1");