Skip to content

Commit cee4a9e

Browse files
committed
Revert "Bug 1967512 - Implement initial functionality of trust panel. r=desktop-theme-reviewers,urlbar-reviewers,dao,reusable-components-reviewers,Itiel,tgiles,fluent-reviewers,bolsson" for causing bc failures on browser_bug484315.js
This reverts commit f0d71f8.
1 parent 8526d25 commit cee4a9e

28 files changed

+6
-1138
lines changed

browser/base/content/browser-siteProtections.js

Lines changed: 1 addition & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -216,15 +216,6 @@ class ProtectionCategory {
216216
};
217217
}
218218

219-
/*
220-
* Return the number items blocked by this blocker.
221-
* @returns {Integer} count - The number of items blocked.
222-
*/
223-
async getBlockerCount() {
224-
let { items } = await this._generateSubViewListItems();
225-
return items?.childElementCount ?? 0;
226-
}
227-
228219
/**
229220
* Create a DOM item representing a tracker.
230221
* @param {string} origin - Origin of the tracker.
@@ -329,13 +320,6 @@ class ProtectionCategory {
329320

330321
let Fingerprinting =
331322
new (class FingerprintingProtection extends ProtectionCategory {
332-
iconSrc = "chrome://browser/skin/fingerprint.svg";
333-
l10nKeys = {
334-
title: "fingerprinter",
335-
content: "fingerprinters",
336-
general: "fingerprinter",
337-
};
338-
339323
constructor() {
340324
super(
341325
"fingerprinters",
@@ -409,6 +393,7 @@ let Fingerprinting =
409393

410394
return (state & blockFlag) != 0;
411395
}
396+
412397
// TODO (Bug 1864914): Consider showing suspicious fingerprinting as allowed
413398
// when the fingerprinting protection is disabled.
414399
})();
@@ -424,23 +409,8 @@ let Cryptomining = new ProtectionCategory(
424409
}
425410
);
426411

427-
Cryptomining.l10nId = "trustpanel-cryptomining";
428-
Cryptomining.iconSrc = "chrome://browser/skin/controlcenter/cryptominers.svg";
429-
Cryptomining.l10nKeys = {
430-
title: "cryptominer",
431-
content: "cryptominers",
432-
general: "cryptominer",
433-
};
434-
435412
let TrackingProtection =
436413
new (class TrackingProtection extends ProtectionCategory {
437-
iconSrc = "chrome://browser/skin/canvas.svg";
438-
l10nKeys = {
439-
title: "tracking-content",
440-
content: "tracking-content",
441-
general: "tracking-content",
442-
};
443-
444414
constructor() {
445415
super(
446416
"trackers",
@@ -677,13 +647,6 @@ let TrackingProtection =
677647

678648
let ThirdPartyCookies =
679649
new (class ThirdPartyCookies extends ProtectionCategory {
680-
iconSrc = "chrome://browser/skin/controlcenter/3rdpartycookies.svg";
681-
l10nKeys = {
682-
title: "cookies-trackers",
683-
content: "cross-site-tracking-cookies",
684-
general: "tracking-cookies",
685-
};
686-
687650
constructor() {
688651
super(
689652
"cookies",
@@ -809,34 +772,6 @@ let ThirdPartyCookies =
809772
return this.prefEnabledValues.includes(this.behaviorPref);
810773
}
811774

812-
_generateSubViewListItems() {
813-
let fragment = document.createDocumentFragment();
814-
let contentBlockingLog = gBrowser.selectedBrowser.getContentBlockingLog();
815-
contentBlockingLog = JSON.parse(contentBlockingLog);
816-
let categories = this._processContentBlockingLog(contentBlockingLog);
817-
818-
let categoryNames = ["trackers"];
819-
switch (this.behaviorPref) {
820-
case Ci.nsICookieService.BEHAVIOR_REJECT:
821-
categoryNames.push("firstParty");
822-
// eslint-disable-next-line no-fallthrough
823-
case Ci.nsICookieService.BEHAVIOR_REJECT_FOREIGN:
824-
categoryNames.push("thirdParty");
825-
}
826-
827-
for (let category of categoryNames) {
828-
let itemsToShow = categories[category];
829-
830-
if (!itemsToShow.length) {
831-
continue;
832-
}
833-
for (let info of itemsToShow) {
834-
fragment.appendChild(this._createListItem(info));
835-
}
836-
}
837-
return { items: fragment };
838-
}
839-
840775
updateSubView() {
841776
let contentBlockingLog = gBrowser.selectedBrowser.getContentBlockingLog();
842777
contentBlockingLog = JSON.parse(contentBlockingLog);
@@ -1127,13 +1062,6 @@ let ThirdPartyCookies =
11271062

11281063
let SocialTracking =
11291064
new (class SocialTrackingProtection extends ProtectionCategory {
1130-
iconSrc = "chrome://browser/skin/thumb-down.svg";
1131-
l10nKeys = {
1132-
title: "social-media-trackers",
1133-
content: "social-media-trackers",
1134-
general: "social-tracking",
1135-
};
1136-
11371065
constructor() {
11381066
super(
11391067
"socialblock",

0 commit comments

Comments
 (0)