diff --git a/browser/components/nsBrowserGlue.js b/browser/components/nsBrowserGlue.js index bac3e91de04f..44d4377c0325 100644 --- a/browser/components/nsBrowserGlue.js +++ b/browser/components/nsBrowserGlue.js @@ -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); diff --git a/configure.in b/configure.in index 7f4dfba4b06f..6740a9826566 100644 --- a/configure.in +++ b/configure.in @@ -9014,6 +9014,10 @@ AC_SUBST(MOZ_PKG_SPECIAL) AC_SUBST(MOZILLA_OFFICIAL) +if test "$MOZ_TELEMETRY_REPORTING"; then + AC_DEFINE(MOZ_TELEMETRY_REPORTING) +fi + dnl win32 options AC_SUBST(MOZ_MAPINFO) AC_SUBST(MOZ_BROWSE_INFO)