nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1572582 - Merge healthreport-prefs.js into all.js. r=chutten

Browse source 
This makes prefs definition simpler, more consistent, and less error-prone.

The patch also changes the form of the "not Android" condition to one used more
widely in all.js.

Differential Revision: https://phabricator.services.mozilla.com/D41299

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Nicholas Nethercote 2019-08-11 23:31:30 +00:00
parent 0f5a239170
commit d138bffba8
6 changed files with 10 additions and 18 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

1
.prettierignore
View file

@ -31,7 +31,6 @@ modules/libpref/test/unit/extdata/testExt.js
remote/pref/remote.js remote/pref/remote.js
services/sync/tests/unit/prefs_test_prefs_store.js services/sync/tests/unit/prefs_test_prefs_store.js
testing/marionette/prefs/marionette.js testing/marionette/prefs/marionette.js
toolkit/components/telemetry/healthreport-prefs.js
# Ignore testing pref files which aren't parsed normally. # Ignore testing pref files which aren't parsed normally.
testing/profiles/**/user.js testing/profiles/**/user.js

1
mobile/android/installer/removed-files.in
View file

@ -1,4 +1,3 @@
update.locale update.locale
README.txt README.txt
defaults/preferences/healthreport-prefs.js
components/dom_webspeech.xpt components/dom_webspeech.xpt

5
modules/libpref/greprefs.js
View file

@ -1,7 +1,2 @@
#include init/all.js #include init/all.js
#include ../../devtools/shared/preferences/devtools-shared.js #include ../../devtools/shared/preferences/devtools-shared.js
#ifdef MOZ_SERVICES_HEALTHREPORT
#if MOZ_WIDGET_TOOLKIT != android
#include ../../toolkit/components/telemetry/healthreport-prefs.js
#endif
#endif

9
modules/libpref/init/all.js
View file

@ -5665,6 +5665,15 @@ pref("datareporting.policy.minimumPolicyVersion.channel-beta", 2);
pref("datareporting.policy.firstRunURL", "https://www.mozilla.org/privacy/firefox/"); pref("datareporting.policy.firstRunURL", "https://www.mozilla.org/privacy/firefox/");
#endif #endif
#ifdef MOZ_SERVICES_HEALTHREPORT
#if !defined(ANDROID)
pref("datareporting.healthreport.infoURL", "https://www.mozilla.org/legal/privacy/firefox.html#health-report");
// Health Report is enabled by default on all channels.
pref("datareporting.healthreport.uploadEnabled", true);
#endif
#endif
pref("services.common.log.logger.rest.request", "Debug"); pref("services.common.log.logger.rest.request", "Debug");
pref("services.common.log.logger.rest.response", "Debug"); pref("services.common.log.logger.rest.response", "Debug");
pref("services.common.log.logger.tokenserverclient", "Debug"); pref("services.common.log.logger.tokenserverclient", "Debug");

2
toolkit/components/telemetry/docs/internals/preferences.rst
View file

@ -28,7 +28,7 @@ mozconfig Defines
When Defined (which it is on most platforms): When Defined (which it is on most platforms):
* includes ``toolkit/components/telemetry/healthreport-prefs.js`` (which sets ``datareporting.healthreport.{infoURL|uploadEnabled}``) * Sets ``datareporting.healthreport.{infoURL|uploadEnabled}`` in ``modules/libpref/init/all.js``.
``MOZ_DATA_REPORTING`` ``MOZ_DATA_REPORTING``

10
toolkit/components/telemetry/healthreport-prefs.js
View file

@ -1,10 +0,0 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
/* global pref */
pref("datareporting.healthreport.infoURL", "https://www.mozilla.org/legal/privacy/firefox.html#health-report");
// Health Report is enabled by default on all channels.
pref("datareporting.healthreport.uploadEnabled", true);