Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-20 08:45:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1573565 - [Protections Panel] Remove strict mode hint from trackers subview. r=johannh

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D42821

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Nihanth Subramanya 2019-08-21 12:09:27 +00:00
parent 23291e6c74
commit 56dca3a160
4 changed files with 0 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
browser/base/content/browser-siteProtections.js
View File

@ -311,13 +311,6 @@ var TrackingProtection = {
));
},
get strictInfo() {
delete this.strictInfo;
return (this.strictInfo = document.getElementById(
"protections-popup-trackersView-strict-info"
));
},
strings: {
get subViewBlocked() {
delete this.subViewBlocked;
@ -411,9 +404,6 @@ var TrackingProtection = {
let contentBlockingLog = await gBrowser.selectedBrowser.getContentBlockingLog();
contentBlockingLog = JSON.parse(contentBlockingLog);
// Don't tell the user to turn on TP if they are already blocking trackers.
this.strictInfo.hidden = this.enabled;
let fragment = document.createDocumentFragment();
for (let [origin, actions] of Object.entries(contentBlockingLog)) {
let listItem = await this._createListItem(origin, actions);

9
browser/base/content/test/trackingUI/browser_trackingUI_trackers_subview.js
View File

@ -46,15 +46,6 @@ async function assertSitesListed(blocked) {
);
is(listItems.length, 1, "We have 1 tracker in the list");
let strictInfo = document.getElementById(
"protections-popup-trackersView-strict-info"
);
is(
BrowserTestUtils.is_hidden(strictInfo),
Services.prefs.getBoolPref(TP_PREF),
"Strict info is hidden if TP is enabled."
);
let mainView = document.getElementById("protections-popup-mainView");
viewShown = BrowserTestUtils.waitForEvent(mainView, "ViewShown");
let backButton = trackersView.querySelector(".subviewbutton-back");

4
browser/components/controlcenter/content/protectionsPanel.inc.xul
View File

@ -191,10 +191,6 @@
</vbox>
<vbox id="protections-popup-trackersView-list" class="protections-popup-list">
</vbox>
<hbox id="protections-popup-trackersView-strict-info">
<image/>
<label>&contentBlocking.trackersView.strictInfo.label;</label>
</hbox>
<vbox class="panel-footer">
<button id="protections-popup-trackersView-settings-button"
label="&contentBlocking.manageSettings2.label;"

2
browser/locales/en-US/chrome/browser/browser.dtd
View File

@ -795,8 +795,6 @@ you can use these alternative items. Otherwise, their values should be empty. -
<!ENTITY contentBlocking.manageSettings2.label "Manage Protection Settings">
<!ENTITY contentBlocking.manageSettings.accesskey "M">
<!ENTITY contentBlocking.trackersView.strictInfo.label "To block all trackers, set content blocking to “Strict”.">
<!ENTITY contentBlocking.socialblock.label "Social Media Trackers">
<!ENTITY contentBlocking.cookies2.label "Cross-Site Tracking Cookies">