Skip to content

Commit 3a4715e

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. Depends on D192628 Differential Revision: https://phabricator.services.mozilla.com/D193799
1 parent 26cc2fc commit 3a4715e

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", () => {
@@ -246,13 +245,13 @@ export var AttributionCode = {
246245
return gCachedAttrData;
247246
}
248247

249-
// This is a temporary block while we rollout macOS attribution.
248+
// This is a temporary block until we're ready to enable macOS reporting by default.
250249
if (
251250
AppConstants.platform == "macosx" &&
252-
!lazy.NimbusFeatures.attribution.getVariable("macosEnabled")
251+
!Services.prefs.getBoolPref("browser.attribution.macos.enabled")
253252
) {
254253
lazy.log.debug(
255-
"getAttrDataSync: macOS attribution disabled by nimbus; skipping"
254+
"getAttrDataSync: macOS attribution disabled by pref; skipping"
256255
);
257256
return {};
258257
}

toolkit/components/nimbus/FeatureManifest.yaml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2001,16 +2001,6 @@ feltPrivacy:
20012001
description: >-
20022002
Enables the reset PBM feature button and confirmation panel.
20032003
2004-
attribution:
2005-
description: Prefs related to install attribution
2006-
hasExposure: false
2007-
isEarlyStartup: true
2008-
variables:
2009-
macosEnabled:
2010-
type: boolean
2011-
description: Whether or not macOS attribution data will be processed and sent in Telemetry
2012-
fallbackPref: browser.attribution.macos.enabled
2013-
20142004
phc:
20152005
description: Prefs to control the Probabalistic Heap Checker (PHC)
20162006
owner: pbone@mozilla.com

0 commit comments

Comments
 (0)