Bug 667577 - Don't show the telemetry prompt unless the MOZ_TELEMETRY_REPORTING variable is defined. r=khuey

This commit is contained in:
Mike Hommey
2011-07-15 18:57:13 +02:00
parent 88ee7b681e
commit bf519f7df0
2 changed files with 8 additions and 0 deletions

View File

@@ -378,9 +378,11 @@ BrowserGlue.prototype = {
// Show about:rights notification, if needed.
if (this._shouldShowRights()) {
this._showRightsNotification();
#ifdef MOZ_TELEMETRY_REPORTING
} else {
// Only show telemetry notification when about:rights notification is not shown.
this._showTelemetryNotification();
#endif
}
@@ -740,6 +742,7 @@ BrowserGlue.prototype = {
}
},
#ifdef MOZ_TELEMETRY_REPORTING
_showTelemetryNotification: function BG__showTelemetryNotification() {
const PREF_TELEMETRY_PROMPTED = "toolkit.telemetry.prompted";
const PREF_TELEMETRY_ENABLED = "toolkit.telemetry.enabled";
@@ -805,6 +808,7 @@ BrowserGlue.prototype = {
let description = notification.ownerDocument.getAnonymousElementByAttribute(notification, "anonid", "messageText");
description.appendChild(link);
},
#endif
_showPluginUpdatePage: function BG__showPluginUpdatePage() {
Services.prefs.setBoolPref(PREF_PLUGINS_NOTIFYUSER, false);