Skip to content

Commit 434595b

Browse files
committed
Bug 1862724: remove nimbus controls for macOS attribution. r=nalexander
The pref is being kept for now, to make it easy for QA to verify dynamic attribution when it is ready. Differential Revision: https://phabricator.services.mozilla.com/D193799
1 parent 54a14a1 commit 434595b

File tree

2 files changed

+3
-14
lines changed

2 files changed

+3
-14
lines changed

browser/components/attribution/AttributionCode.sys.mjs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import { AppConstants } from "resource://gre/modules/AppConstants.sys.mjs";
1616
const lazy = {};
1717
ChromeUtils.defineESModuleGetters(lazy, {
1818
MacAttribution: "resource:///modules/MacAttribution.sys.mjs",
19-
NimbusFeatures: "resource://nimbus/ExperimentAPI.sys.mjs",
2019
UpdateUtils: "resource://gre/modules/UpdateUtils.sys.mjs",
2120
});
2221
ChromeUtils.defineLazyGetter(lazy, "log", () => {
@@ -238,13 +237,13 @@ export var AttributionCode = {
238237
return gCachedAttrData;
239238
}
240239

241-
// This is a temporary block while we rollout macOS attribution.
240+
// This is a temporary block until we're ready to enable macOS reporting by default.
242241
if (
243242
AppConstants.platform == "macosx" &&
244-
!lazy.NimbusFeatures.attribution.getVariable("macosEnabled")
243+
!Services.prefs.getBoolPref("browser.attribution.macos.enabled")
245244
) {
246245
lazy.log.debug(
247-
"getAttrDataSync: macOS attribution disabled by nimbus; skipping"
246+
"getAttrDataSync: macOS attribution disabled by pref; skipping"
248247
);
249248
return {};
250249
}

toolkit/components/nimbus/FeatureManifest.yaml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1971,16 +1971,6 @@ feltPrivacy:
19711971
description: >-
19721972
Enables the reset PBM feature button and confirmation panel.
19731973
1974-
attribution:
1975-
description: Prefs related to install attribution
1976-
hasExposure: false
1977-
isEarlyStartup: true
1978-
variables:
1979-
macosEnabled:
1980-
type: boolean
1981-
description: Whether or not macOS attribution data will be processed and sent in Telemetry
1982-
fallbackPref: browser.attribution.macos.enabled
1983-
19841974
phc:
19851975
description: Prefs to control the Probabalistic Heap Checker (PHC)
19861976
owner: pbone@mozilla.com

0 commit comments

Comments
 (0)