Design spec is here: https://mozilla.invisionapp.com/share/VSMVD99JK6D#/screens/301705296 63 is introducing a new "content blocking" mode that takes the place of tracking protection and demotes it to a category of content blocking. This will be behind a pref for now, which means the UI has to be able to fit both for the old TP content as well as the new Content Blocking. The main change for the identity popup is the introduction of a list of content blockers as well as slightly updated tracking descriptions. The "reload to apply changes" code also needs to get a little smarter (we can't just look at blocked-content and a single pref anymore) and show a text-link instead of changing the button behavior now. If the content blocking UI pref is off, we need to: - Change the header to "Tracking Protection" - Hide the list of blockable content - Show an alternative description in cases where the list would have been the only element above the button.

This commit also moves the remaining trackingUI_* tests out of b/b/c/test/general, since I needed to touch them anyway

Comment on attachment 8997852 [details] Bug 1476218 - Part 2 - Add a "Disabled" label to the content blocking section in the identity popup. r=nhnt11 Nihanth Subramanya [:nhnt11] has approved the revision.

Comment on attachment 8997851 [details] Bug 1476218 - Part 1 - Update Tracking Protection section in the identity popup for Content Blocking. r=nhnt11 Nihanth Subramanya [:nhnt11] has approved the revision.

Comment on attachment 8998508 [details] Bug 1476218 - Part 3 - Update Tracking Protection tests to reflect Content Blocking changes. r=nhnt11 Nihanth Subramanya [:nhnt11] has approved the revision.

https://hg.mozilla.org/integration/mozilla-inbound/rev/e55d75be1dcd1904816c6d4d2299614595e29aae Bug 1476218 - Part 1 - Update Tracking Protection section in the identity popup for Content Blocking. r=nhnt11 https://hg.mozilla.org/integration/mozilla-inbound/rev/d2d9e5e7112cf228f8d4537113950940ce228af4 Bug 1476218 - Part 2 - Add a "Disabled" label to the content blocking section in the identity popup. r=nhnt11 https://hg.mozilla.org/integration/mozilla-inbound/rev/3ff2f60011af3b786eb297f7e1c5e3b7cb8a749f Bug 1476218 - Part 3 - Update Tracking Protection tests to reflect Content Blocking changes. r=nhnt11

Sorry, only noticed this when I started translating https://hg.mozilla.org/mozilla-central/rev/e55d75be1dcd#l8.16 +<!ENTITY contentBlocking.detected "Blockable content detected on this site."> +<!ENTITY contentBlocking.notDetected "No blockable content detected on this page"> The second string is missing a trailing period. If we can fix this quickly, I can wait a few days to expose these strings to tools and let you update the string without a new ID.

https://hg.mozilla.org/mozilla-central/rev/e55d75be1dcd https://hg.mozilla.org/mozilla-central/rev/d2d9e5e7112c https://hg.mozilla.org/mozilla-central/rev/3ff2f60011af

(In reply to Francesco Lodolo [:flod] from comment #10) > Sorry, only noticed this when I started translating > https://hg.mozilla.org/mozilla-central/rev/e55d75be1dcd#l8.16 > > +<!ENTITY contentBlocking.detected "Blockable content detected on this > site."> > +<!ENTITY contentBlocking.notDetected "No blockable content detected on this > page"> > > The second string is missing a trailing period. > > If we can fix this quickly, I can wait a few days to expose these strings to > tools and let you update the string without a new ID. Move to bug 1482637