Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-07 18:04:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1234518 - Clean MOZ_SERVICES_HEALTHREPORT and and MOZ_SERVICES_METRICS. r=gfritzsche

Browse Source
This commit is contained in:
Alessio Placitelli 2016-01-21 07:59:00 +01:00
parent d7010417d3
commit b1d0b9f9dc
5 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
browser/base/content/baseMenuOverlay.xul
View File

@ -61,7 +61,7 @@
onclick="checkForMiddleClick(this, event);"
label="&helpKeyboardShortcuts.label;"
accesskey="&helpKeyboardShortcuts.accesskey;"/>
#ifdef MOZ_SERVICES_HEALTHREPORT
#ifdef MOZ_TELEMETRY_REPORTING
<menuitem id="healthReport"
label="&healthReport2.label;"
accesskey="&healthReport2.accesskey;"

4
browser/components/nsBrowserGlue.js
View File

@ -535,7 +535,7 @@ BrowserGlue.prototype = {
this._isPlacesShutdownObserver = true;
os.addObserver(this, "handle-xul-text-link", false);
os.addObserver(this, "profile-before-change", false);
if (AppConstants.MOZ_SERVICES_HEALTHREPORT) {
if (AppConstants.MOZ_TELEMETRY_REPORTING) {
os.addObserver(this, "keyword-search", false);
}
os.addObserver(this, "browser-search-engine-modified", false);
@ -594,7 +594,7 @@ BrowserGlue.prototype = {
os.removeObserver(this, "places-shutdown");
os.removeObserver(this, "handle-xul-text-link");
os.removeObserver(this, "profile-before-change");
if (AppConstants.MOZ_SERVICES_HEALTHREPORT) {
if (AppConstants.MOZ_TELEMETRY_REPORTING) {
os.removeObserver(this, "keyword-search");
}
os.removeObserver(this, "browser-search-engine-modified");

6
browser/components/preferences/in-content/advanced.js
View File

@ -44,7 +44,7 @@ var gAdvancedPane = {
this.initSubmitCrashes();
#endif
this.initTelemetry();
#ifdef MOZ_SERVICES_HEALTHREPORT
#ifdef MOZ_TELEMETRY_REPORTING
this.initSubmitHealthReport();
#endif
this.updateOnScreenKeyboardVisibility();
@ -56,7 +56,7 @@ var gAdvancedPane = {
gAdvancedPane.updateHardwareAcceleration);
setEventListener("advancedPrefs", "select",
gAdvancedPane.tabSelectionChanged);
#ifdef MOZ_SERVICES_HEALTHREPORT
#ifdef MOZ_TELEMETRY_REPORTING
setEventListener("submitHealthReportBox", "command",
gAdvancedPane.updateSubmitHealthReport);
#endif
@ -289,7 +289,7 @@ var gAdvancedPane = {
#endif
},
#ifdef MOZ_SERVICES_HEALTHREPORT
#ifdef MOZ_TELEMETRY_REPORTING
/**
* Initialize the health report service reference and checkbox.
*/

4
browser/components/preferences/in-content/advanced.xul
View File

@ -199,7 +199,7 @@
#ifdef MOZ_DATA_REPORTING
<!-- Data Choices -->
<tabpanel id="dataChoicesPanel" orient="vertical">
#ifdef MOZ_SERVICES_HEALTHREPORT
#ifdef MOZ_TELEMETRY_REPORTING
<groupbox>
<caption>
<checkbox id="submitHealthReportBox" label="&enableHealthReport.label;"
@ -212,7 +212,6 @@
<label id="FHRLearnMore"
class="text-link">&healthReportLearnMore.label;</label>
</hbox>
#ifdef MOZ_TELEMETRY_REPORTING
<hbox class="indent">
<groupbox flex="1">
<caption>
@ -228,7 +227,6 @@
</hbox>
</groupbox>
</hbox>
#endif
</vbox>
</groupbox>
#endif

6
configure.in
View File

@ -8425,12 +8425,6 @@ if test -n "$MOZ_SERVICES_HEALTHREPORT"; then
AC_DEFINE(MOZ_SERVICES_HEALTHREPORT)
fi
dnl Build Services metrics component
AC_SUBST(MOZ_SERVICES_METRICS)
if test -n "$MOZ_SERVICES_METRICS"; then
AC_DEFINE(MOZ_SERVICES_METRICS)
fi
dnl Build Notifications if required
AC_SUBST(MOZ_SERVICES_NOTIFICATIONS)
if test -n "$MOZ_SERVICES_NOTIFICATIONS"; then