Bug 725407 and bug 699806 added notifications that in some circumstances we don’t want to display at all. For instance: Talos, WebApps, Mochitests, etc. We made a temp fix for Talos in bug 824365 that will be broken at next TELEMETRY_DISPLAY_REV revision: 'toolkit.telemetry.prompted': 2, + 'toolkit.telemetry.notifiedOptOut': 2, I propose to use 999 instead, so when we check the pref value in nbBrowserGlue.js or browser.js, we need: if (telemetryDisplayed >== TELEMETRY_DISPLAY_REV) return; Users will now be able to permanently hide the pref by setting it to 999. Gavin, is that ok?

I think that's probably OK - seems like we won't need to support downgrade prompting.

I haven’t tried it… (Looks like it’s not easy to run Talos on Android)

No need to use #expand, now. I also fixed a comment I should have fixed earlier.

Comment on attachment 696850 [details] [diff] [review] m-c patch Review of attachment 696850 [details] [diff] [review]: ----------------------------------------------------------------- ::: browser/components/nsBrowserGlue.js @@ +909,5 @@ > * But do not display this prompt/notification if: > * > * - The last accepted/refused policy (either by accepting the prompt or by > * manually flipping the telemetry preference) is already at version > + * TELEMETRY_DISPLAY_REV or higher (when we skip it in tests). s/when we skip it in tests/to avoid the prompt in tests/ ::: build/automation.py.in @@ +407,5 @@ > user_pref("app.update.staging.enabled", false); > user_pref("browser.panorama.experienced_first_run", true); // Assume experienced > user_pref("dom.w3c_touch_events.enabled", 1); > +user_pref("toolkit.telemetry.prompted", 999); > +user_pref("toolkit.telemetry.notifiedOptOut", 999); Please add a comment above like // Set a future policy version to avoid the telemetry prompt. ::: layout/tools/reftest/remotereftest.py @@ +320,5 @@ > user_pref("font.size.inflation.emPerLine", 0); > user_pref("font.size.inflation.minTwips", 0); > user_pref("reftest.remote", true); > +user_pref("toolkit.telemetry.prompted", 999); > +user_pref("toolkit.telemetry.notifiedOptOut", 999); ditto ::: layout/tools/reftest/runreftestb2g.py @@ +405,5 @@ > user_pref("reftest.browser.iframe.enabled", true); > user_pref("reftest.remote", true); > user_pref("reftest.uri", "%s"); > +user_pref("toolkit.telemetry.prompted", 999); > +user_pref("toolkit.telemetry.notifiedOptOut", 999); ditto ::: mobile/android/chrome/content/WebAppRT.js @@ +27,5 @@ > // Disable add-on installation via the web-exposed APIs > pref("xpinstall.enabled", false), > // Disable the telemetry prompt in webapps > + pref("toolkit.telemetry.prompted", 999), > + pref("toolkit.telemetry.notifiedOptOut", 999) ditto ::: mobile/android/chrome/content/browser.js @@ +7282,5 @@ > * But do not display this prompt/notification if: > * > * - The last accepted/refused policy (either by accepting the prompt or by > * manually flipping the telemetry preference) is already at version > + * TELEMETRY_DISPLAY_REV or higher (when we skip it in tests). ditto

Comment on attachment 696849 [details] [diff] [review] Talos patch Review of attachment 696849 [details] [diff] [review]: ----------------------------------------------------------------- glad we could make this happen. Let me know when the binaries on inbound will accept this.

m-c patch landed on inbound https://hg.mozilla.org/integration/mozilla-inbound/rev/131e96bffe85 Joel, you can land it :)

landed the talos fix: http://hg.mozilla.org/build/talos/rev/a18c35beec1a