commit f9615d62849db7283f345d65ceb4f171284ac00d
parent a340aa4067b9f36f56c46f2d64cbf6c5c8acc554
Author: Sandor Molnar <smolnar@mozilla.com>
Date: Tue, 23 Dec 2025 17:58:18 +0200
Revert "Bug 2001195 - Implement Browsing data card - r=emz,fluent-reviewers,akulyk,bolsson" for causing bc failures @ browser_privacypane_2_srd.js
This reverts commit 90213c0a71e37556965b5cdcac8d4088064713a2.
Diffstat:
4 files changed, 2 insertions(+), 87 deletions(-)
diff --git a/browser/components/preferences/main.js b/browser/components/preferences/main.js
@@ -2920,74 +2920,6 @@ SettingGroupManager.registerGroups({
},
],
},
- cookiesAndSiteData2: {
- inProgress: true,
- l10nId: "sitedata-heading",
- headingLevel: 2,
- items: [
- {
- id: "siteDataSize",
- l10nId: "sitedata-total-size-calculating",
- control: "moz-box-item",
- supportPage: "sitedata-learn-more",
- },
- {
- id: "manageDataSettingsGroup",
- control: "moz-box-group",
- controlAttrs: {
- type: "default",
- },
- items: [
- {
- id: "clearSiteDataButton",
- l10nId: "sitedata-clear2",
- control: "moz-box-button",
- iconSrc: "chrome://browser/skin/flame.svg",
- controlAttrs: {
- "search-l10n-ids": `
- clear-site-data-cookies-empty.label,
- clear-site-data-cache-empty.label
- `,
- },
- },
- {
- id: "siteDataSettings",
- l10nId: "sitedata-settings3",
- control: "moz-box-button",
- controlAttrs: {
- "search-l10n-ids": `
- site-data-settings-window.title,
- site-data-column-host.label,
- site-data-column-cookies.label,
- site-data-column-storage.label,
- site-data-settings-description,
- site-data-remove-all.label,
- `,
- },
- },
- {
- id: "cookieExceptions",
- l10nId: "sitedata-cookies-exceptions3",
- control: "moz-box-button",
- controlAttrs: {
- "search-l10n-ids": `
- permissions-address,
- permissions-block.label,
- permissions-allow.label,
- permissions-remove.label,
- permissions-remove-all.label,
- permissions-exceptions-cookie-desc
- `,
- },
- },
- ],
- },
- {
- id: "deleteOnClose",
- l10nId: "sitedata-delete-on-close",
- },
- ],
- },
networkProxy: {
items: [
{
diff --git a/browser/components/preferences/privacy.inc.xhtml b/browser/components/preferences/privacy.inc.xhtml
@@ -403,11 +403,10 @@
</groupbox>
-<groupbox id="siteDataGroup" data-category="panePrivacy" hidden="true" aria-describedby="totalSiteDataSize" data-srd-groupid="cookiesAndSiteData2">
+<groupbox id="siteDataGroup" data-category="panePrivacy" hidden="true" aria-describedby="totalSiteDataSize">
<label><html:h2 data-l10n-id="sitedata-header"/></label>
<html:setting-group groupid="cookiesAndSiteData"/>
</groupbox>
-<html:setting-group groupid="cookiesAndSiteData2" data-category="panePrivacy" hidden="true" />
<!-- Cookie Banner Handling -->
<groupbox id="cookieBannerHandlingGroup" data-category="panePrivacy" data-subcategory="cookiebanner" hidden="true">
diff --git a/browser/components/preferences/privacy.js b/browser/components/preferences/privacy.js
@@ -3774,7 +3774,6 @@ var gPrivacyPane = {
initSettingGroup("httpsOnly");
initSettingGroup("browsingProtection");
initSettingGroup("cookiesAndSiteData");
- initSettingGroup("cookiesAndSiteData2");
initSettingGroup("certificates");
initSettingGroup("ipprotection");
initSettingGroup("history");
diff --git a/browser/locales-preview/privacyPreferences.ftl b/browser/locales-preview/privacyPreferences.ftl
@@ -322,19 +322,4 @@ do-not-track-removal3 =
.message = We no longer support the “Do Not Track” feature
non-technical-privacy-heading =
- .label = Website Privacy Preferences
-
-## Site Data
-
-sitedata-heading =
- .label = Browsing data
- .description = Manage your cookies, history, cache, website data, and more.
-
-sitedata-settings3 =
- .label = Clear data for specific sites
- .accesskey = s
-
-sitedata-cookies-exceptions3 =
- .label = Manage exceptions
- .accesskey = x
- .description = Choose how specific sites handle cookies and site data.
+ .label = Website Privacy Preferences
