diff --git a/browser/components/about/AboutRedirector.cpp b/browser/components/about/AboutRedirector.cpp index 6d0364efb425..6b9771364771 100644 --- a/browser/components/about/AboutRedirector.cpp +++ b/browser/components/about/AboutRedirector.cpp @@ -96,12 +96,6 @@ static const RedirEntry kRedirMap[] = { {"sessionrestore", "chrome://browser/content/aboutSessionRestore.xhtml", nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::HIDE_FROM_ABOUTABOUT | nsIAboutModule::IS_SECURE_CHROME_UI}, - {"shoppingsidebar", "chrome://browser/content/shopping/shopping.html", - nsIAboutModule::URI_MUST_LOAD_IN_CHILD | - nsIAboutModule::URI_CAN_LOAD_IN_PRIVILEGEDABOUT_PROCESS | - nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | - nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::HIDE_FROM_ABOUTABOUT | - nsIAboutModule::IS_SECURE_CHROME_UI}, {"tabcrashed", "chrome://browser/content/aboutTabCrashed.xhtml", nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::HIDE_FROM_ABOUTABOUT}, diff --git a/browser/components/about/components.conf b/browser/components/about/components.conf index 769b0c593204..e0a87d43ef9e 100644 --- a/browser/components/about/components.conf +++ b/browser/components/about/components.conf @@ -29,7 +29,6 @@ pages = [ 'robots', 'sessionrestore', 'settings', - 'shoppingsidebar', 'tabcrashed', 'unloads', 'welcome', diff --git a/browser/themes/shared/browser-shared.css b/browser/themes/shared/browser-shared.css index 76776f04f6ac..adb35901f766 100644 --- a/browser/themes/shared/browser-shared.css +++ b/browser/themes/shared/browser-shared.css @@ -1352,13 +1352,3 @@ panel toolbarseparator { #PictureInPicturePanelFooter { margin: 8px 16px 16px; } - -/* Shopping sidebar */ - -shopping-sidebar { - border-inline-start: 1px solid var(--chrome-content-separator-color); - min-width: 16.92em; - max-width: 32.31em; - width: 320px; - box-sizing: content-box; -} diff --git a/browser/themes/shared/urlbar-searchbar.css b/browser/themes/shared/urlbar-searchbar.css index c8ee7642d99b..fa1c702f35b1 100644 --- a/browser/themes/shared/urlbar-searchbar.css +++ b/browser/themes/shared/urlbar-searchbar.css @@ -993,24 +993,6 @@ } } -/* Shopping Sidebar icon */ - -#shopping-sidebar-button > .urlbar-icon { - list-style-image: url(chrome://browser/content/shopping/assets/shopping.svg); - pointer-events: none; -} - -#shopping-sidebar-button[shoppingsidebaropen="true"] > .urlbar-icon { - fill: var(--toolbarbutton-icon-fill-attention); - fill-opacity: 1; -} - -@media (prefers-contrast) { - #shopping-sidebar-button[shoppingsidebaropen="true"]:hover > .urlbar-icon { - fill: currentColor; - } -} - /* Search bar */ #search-container, diff --git a/dom/security/nsContentSecurityUtils.cpp b/dom/security/nsContentSecurityUtils.cpp index 710691fcb86c..6d1fa12ddcc1 100644 --- a/dom/security/nsContentSecurityUtils.cpp +++ b/dom/security/nsContentSecurityUtils.cpp @@ -1330,7 +1330,6 @@ static nsLiteralCString sImgSrcDataBlobAllowList[] = { "about:reader"_ns, "about:sessionrestore"_ns, "about:settings"_ns, - "about:shoppingsidebar"_ns, "about:test-about-content-search-ui"_ns, "about:welcome"_ns, "chrome://browser/content/aboutDialog.xhtml"_ns, @@ -1342,7 +1341,6 @@ static nsLiteralCString sImgSrcDataBlobAllowList[] = { "chrome://browser/content/preferences/dialogs/permissions.xhtml"_ns, "chrome://browser/content/preferences/fxaPairDevice.xhtml"_ns, "chrome://browser/content/screenshots/screenshots-preview.html"_ns, - "chrome://browser/content/shopping/shopping.html"_ns, "chrome://browser/content/sidebar/sidebar-customize.html"_ns, "chrome://browser/content/sidebar/sidebar-history.html"_ns, "chrome://browser/content/sidebar/sidebar-syncedtabs.html"_ns, diff --git a/toolkit/modules/AsyncPrefs.sys.mjs b/toolkit/modules/AsyncPrefs.sys.mjs index 0de63bd6c76c..21106c18ff0c 100644 --- a/toolkit/modules/AsyncPrefs.sys.mjs +++ b/toolkit/modules/AsyncPrefs.sys.mjs @@ -15,14 +15,6 @@ const kAllowedPrefs = new Set([ "browser.contentblocking.report.hide_vpn_banner", "browser.contentblocking.report.show_mobile_app", - "browser.shopping.experience2023.active", - "browser.shopping.experience2023.ads.userEnabled", - "browser.shopping.experience2023.autoOpen.enabled", - "browser.shopping.experience2023.autoOpen.userEnabled", - "browser.shopping.experience2023.optedIn", - "browser.shopping.experience2023.showKeepSidebarClosedMessage", - "browser.shopping.experience2023.sidebarClosedCount", - "narrate.rate", "narrate.voice", diff --git a/toolkit/modules/RemotePageAccessManager.sys.mjs b/toolkit/modules/RemotePageAccessManager.sys.mjs index 9138d4e344a5..cfae855a0acf 100644 --- a/toolkit/modules/RemotePageAccessManager.sys.mjs +++ b/toolkit/modules/RemotePageAccessManager.sys.mjs @@ -261,23 +261,6 @@ export let RemotePageAccessManager = { ], RPMRecordGleanEvent: ["securityUiProtections"], }, - "about:shoppingsidebar": { - RPMSetPref: [ - "browser.shopping.experience2023.optedIn", - "browser.shopping.experience2023.active", - "browser.shopping.experience2023.ads.userEnabled", - "browser.shopping.experience2023.autoOpen.userEnabled", - "browser.shopping.experience2023.sidebarClosedCount", - "browser.shopping.experience2023.showKeepSidebarClosedMessage", - ], - RPMGetFormatURLPref: ["app.support.baseURL"], - RPMGetIntPref: ["browser.shopping.experience2023.sidebarClosedCount"], - RPMGetBoolPref: [ - "browser.shopping.experience2023.showKeepSidebarClosedMessage", - "sidebar.revamp", - "toolkit.shopping.experience2023.defr", - ], - }, "about:tabcrashed": { RPMSendAsyncMessage: ["Load", "closeTab", "restoreTab", "restoreAll"], RPMAddMessageListener: ["*"],