tor-browser

commit a73cc0a8ffdc6a0d00770ad4a6f81eab6842da9f
parent 31814f61f1b0479e260fa15d6aa505fcf739aceb
Author: Micah Killoran <mtigley@mozilla.com>
Date:   Fri, 14 Nov 2025 15:50:59 +0000

Bug 1999812 - Only show Passwords entry when `sidebar.revamp=true`. r=dimi,kcochrane

Differential Revision: https://phabricator.services.mozilla.com/D272335

Diffstat:
M
browser/components/sidebar/browser-sidebar.js
 | 
12
++++++++++++
M
toolkit/components/satchel/megalist/content/tests/browser/browser_passwords_sidebar.js
 | 
17
+++++++++++++++++

2 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/browser/components/sidebar/browser-sidebar.js b/browser/components/sidebar/browser-sidebar.js
@@ -856,6 +856,11 @@ var SidebarController = {
     if (!this.sidebarRevampEnabled) {
       this._state.launcherVisible = false;
       document.getElementById("sidebar-header").hidden = false;
+
+      // Ensure CPM isn't shown.
+      const cpmMenuItem = document.querySelector("#sidebar-switcher-megalist");
+      this.lastOpenedId = this.DEFAULT_SIDEBAR_ID;
+      cpmMenuItem.hidden = true;
     }
     if (!this._sidebars.get(this.lastOpenedId)) {
       this.lastOpenedId = this.DEFAULT_SIDEBAR_ID;
@@ -1074,6 +1079,13 @@ var SidebarController = {
       this.updateToolbarButton();
       return Promise.resolve();
     }
+
+    if (!this.sidebarRevampEnabled) {
+      const cpmMenuItem = document.querySelector("#sidebar-switcher-megalist");
+      this.lastOpenedId = this.DEFAULT_SIDEBAR_ID;
+      cpmMenuItem.hidden = true;
+    }
+
     return this.show(commandID, triggerNode);
   },
 
diff --git a/toolkit/components/satchel/megalist/content/tests/browser/browser_passwords_sidebar.js b/toolkit/components/satchel/megalist/content/tests/browser/browser_passwords_sidebar.js
@@ -372,3 +372,20 @@ add_task(async function test_passwords_visibility_when_view_shown() {
 
   SidebarController.hide();
 });
+
+add_task(async function test_passwords_entry_is_not_visible_for_old_sidebar() {
+  await SpecialPowers.pushPrefEnv({
+    set: [
+      ["sidebar.revamp", false],
+      ["sidebar.main.tools", "aichat,passwords,syncedtabs,history,bookmarks"],
+    ],
+  });
+
+  await SidebarController.toggle();
+  let passwordsMenuItem = document.querySelector("#sidebar-switcher-megalist");
+  ok(
+    passwordsMenuItem.hidden,
+    "Passwords menu item should be hidden for the old sidebar."
+  );
+  SidebarController.hide();
+});