зеркало из https://github.com/mozilla/gecko-dev.git
Bug 667577 - Don't show the telemetry prompt unless the MOZ_TELEMETRY_REPORTING variable is defined. r=khuey
This commit is contained in:
Родитель
f76aa662d8
Коммит
4f068e91ae
|
@ -378,9 +378,11 @@ BrowserGlue.prototype = {
|
||||||
// Show about:rights notification, if needed.
|
// Show about:rights notification, if needed.
|
||||||
if (this._shouldShowRights()) {
|
if (this._shouldShowRights()) {
|
||||||
this._showRightsNotification();
|
this._showRightsNotification();
|
||||||
|
#ifdef MOZ_TELEMETRY_REPORTING
|
||||||
} else {
|
} else {
|
||||||
// Only show telemetry notification when about:rights notification is not shown.
|
// Only show telemetry notification when about:rights notification is not shown.
|
||||||
this._showTelemetryNotification();
|
this._showTelemetryNotification();
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -740,6 +742,7 @@ BrowserGlue.prototype = {
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
#ifdef MOZ_TELEMETRY_REPORTING
|
||||||
_showTelemetryNotification: function BG__showTelemetryNotification() {
|
_showTelemetryNotification: function BG__showTelemetryNotification() {
|
||||||
const PREF_TELEMETRY_PROMPTED = "toolkit.telemetry.prompted";
|
const PREF_TELEMETRY_PROMPTED = "toolkit.telemetry.prompted";
|
||||||
const PREF_TELEMETRY_ENABLED = "toolkit.telemetry.enabled";
|
const PREF_TELEMETRY_ENABLED = "toolkit.telemetry.enabled";
|
||||||
|
@ -805,6 +808,7 @@ BrowserGlue.prototype = {
|
||||||
let description = notification.ownerDocument.getAnonymousElementByAttribute(notification, "anonid", "messageText");
|
let description = notification.ownerDocument.getAnonymousElementByAttribute(notification, "anonid", "messageText");
|
||||||
description.appendChild(link);
|
description.appendChild(link);
|
||||||
},
|
},
|
||||||
|
#endif
|
||||||
|
|
||||||
_showPluginUpdatePage: function BG__showPluginUpdatePage() {
|
_showPluginUpdatePage: function BG__showPluginUpdatePage() {
|
||||||
Services.prefs.setBoolPref(PREF_PLUGINS_NOTIFYUSER, false);
|
Services.prefs.setBoolPref(PREF_PLUGINS_NOTIFYUSER, false);
|
||||||
|
|
|
@ -9014,6 +9014,10 @@ AC_SUBST(MOZ_PKG_SPECIAL)
|
||||||
|
|
||||||
AC_SUBST(MOZILLA_OFFICIAL)
|
AC_SUBST(MOZILLA_OFFICIAL)
|
||||||
|
|
||||||
|
if test "$MOZ_TELEMETRY_REPORTING"; then
|
||||||
|
AC_DEFINE(MOZ_TELEMETRY_REPORTING)
|
||||||
|
fi
|
||||||
|
|
||||||
dnl win32 options
|
dnl win32 options
|
||||||
AC_SUBST(MOZ_MAPINFO)
|
AC_SUBST(MOZ_MAPINFO)
|
||||||
AC_SUBST(MOZ_BROWSE_INFO)
|
AC_SUBST(MOZ_BROWSE_INFO)
|
||||||
|
|
Загрузка…
Ссылка в новой задаче