Merge pull request #315 from mozilla/enterprise-main_merge_20260105

Enterprise main merge 20260105

Author: lissyx

Cargo.lock

@@ -66,7 +66,7 @@ exclude = [
 resolver = "2"
 
 [workspace.package]
-rust-version = "1.82.0"
+rust-version = "1.87.0"
 
 [workspace.dependencies]
 # Shared across multiple UniFFI consumers.

Cargo.toml

@@ -2255,8 +2255,9 @@ pref("browser.aiwindow.enabled", false);
 pref("browser.aiwindow.endpoint", "https://mlpa-prod-prod-mozilla.global.ssl.fastly.net/v1");
 pref("browser.aiwindow.insights", false);
 pref("browser.aiwindow.insightsLogLevel", "Warn");
+pref("browser.aiwindow.firstrun.autoAdvanceMS", 3000);
 pref("browser.aiwindow.firstrun.modelChoice", "");
-pref("browser.aiwindow.model", "");
+pref("browser.aiwindow.model", "qwen3-235b-a22b-instruct-2507-maas");
 
 // Block insecure active content on https pages
 pref("security.mixed_content.block_active_content", true);
@@ -2912,7 +2913,7 @@ pref("browser.toolbars.bookmarks.showOtherBookmarks", true);
 
 // Felt Privacy pref to control simplified private browsing UI
 pref("browser.privatebrowsing.felt-privacy-v1", false);
-pref("security.certerrors.felt-privacy-v1", false);
+pref("security.certerrors.felt-privacy-v1", true);
 
 // Prefs to control the Firefox Account toolbar menu.
 // This pref will surface existing Firefox Account information

browser/app/profile/firefox.js

@@ -73,6 +73,10 @@
                      data-l10n-id="appmenuitem-history"
                      closemenu="none"
                      />
+      <toolbarbutton id="appMenu-chats-history-button"
+                     class="subviewbutton"
+                     data-l10n-id="menu-history-chats"
+                     command="Tools:ChatsHistory"/>
       <toolbarbutton id="appMenu-downloads-button"
                      class="subviewbutton"
                      data-l10n-id="appmenuitem-downloads"

browser/base/content/appmenu-viewcache.inc.xhtml

@@ -32,6 +32,9 @@
   Services.scriptloader.loadSubScript("chrome://browser/content/places/places-menupopup.js", this);
   Services.scriptloader.loadSubScript("chrome://browser/content/search/autocomplete-popup.js", this);
   Services.scriptloader.loadSubScript("chrome://browser/content/search/searchbar.js", this);
+  if (AIWindow.isOpeningAIWindow(window)) {
+    ChromeUtils.importESModule("chrome://browser/content/urlbar/SmartbarInput.mjs", { global: "current" });
+  }
   ChromeUtils.importESModule("chrome://browser/content/urlbar/UrlbarInput.mjs", { global: "current" });
 }
 

browser/base/content/browser-main.js

@@ -214,6 +214,11 @@
                 <menuitem id="menu_showAllHistory"
                           key="showAllHistoryKb"
                           command="Browser:ShowAllHistory" data-l10n-id="menu-history-show-all-history"/>
+
+                <menuitem id="chatsHistoryMenu" class="chats-history-menuitem"
+                          data-l10n-id="menu-history-chats"
+                          disabled="true" hidden="true" command="Tools:ChatsHistory"/>
+
                 <menuitem id="sanitizeItem"
                           key="key_sanitize"
                           command="Tools:Sanitize" data-l10n-id="menu-history-clear-recent-history"/>
@@ -255,8 +260,16 @@
 #endif
                   </menupopup>
                 </menu>
+
+                <menuseparator id="startChatHistorySeparator" hidden="true"/>
+                <menuitem id="recentChatsHeader" class="recent-chats-header"
+                          data-l10n-id="menu-history-chats-recent"
+                          disabled="true" hidden="true"/>
+                <!-- Chat history menu items -->
+
                 <menuseparator id="startHistorySeparator"
                                class="hide-if-empty-places-result"/>
+
               </menupopup>
             </menu>
 

browser/base/content/browser-menubar.inc

@@ -181,6 +181,8 @@ document.addEventListener(
           if (!event.target.parentNode._placesView) {
             new HistoryMenu(event);
           }
+
+          AIWindow.appMenu(event, window);
           break;
         case "historyUndoPopup":
           document

browser/base/content/browser-menubar.js

@@ -98,6 +98,7 @@
     <command id="Tools:Addons" />
     <command id="cmd_openUnifiedExtensionsPanel" />
     <command id="Tools:AIWindow" />
+    <command id="Tools:ChatsHistory" />
     <command id="Tools:ClassicWindow" />
     <command id="Tools:Sanitize" />
     <command id="Tools:PrivateBrowsing" />

browser/base/content/browser-sets.inc

@@ -233,6 +233,10 @@ document.addEventListener(
           case "Tools:AIWindow":
             OpenBrowserWindow({ aiWindow: true });
             break;
+          case "Tools:ChatsHistory":
+            // @todo Bug 2006543
+            // Implement opening the chat history view
+            break;
           case "Tools:Sanitize":
             Sanitizer.showUI(window);
             break;

browser/base/content/browser-sets.js

@@ -45,7 +45,10 @@ async function checkTelemetry(expectedIssuedByCCA) {
   ]);
 }
 
-add_task(async function test_cca_site() {
+async function test_cca_site(useFeltPrivacyV1) {
+  await SpecialPowers.pushPrefEnv({
+    set: [["security.certerrors.felt-privacy-v1", useFeltPrivacyV1]],
+  });
   await resetTelemetry();
   let browser;
   let pageLoaded;
@@ -66,9 +69,12 @@ add_task(async function test_cca_site() {
   // Check that telemetry indicates this was issued by CCA.
   await checkTelemetry("true");
   BrowserTestUtils.removeTab(gBrowser.selectedTab);
-});
+}
 
-add_task(async function test_non_cca_site() {
+async function test_non_cca_site(useFeltPrivacyV1) {
+  await SpecialPowers.pushPrefEnv({
+    set: [["security.certerrors.felt-privacy-v1", useFeltPrivacyV1]],
+  });
   await resetTelemetry();
   let browser;
   let pageLoaded;
@@ -89,4 +95,16 @@ add_task(async function test_non_cca_site() {
   // Check that telemetry indicates this was not issued by CCA.
   await checkTelemetry("false");
   BrowserTestUtils.removeTab(gBrowser.selectedTab);
+}
+
+add_task(async function test_cca_sites() {
+  for (const useFeltPrivacyV1 of [true, false]) {
+    await test_cca_site(useFeltPrivacyV1);
+  }
+});
+
+add_task(async function test_non_cca_sites() {
+  for (const useFeltPrivacyV1 of [true, false]) {
+    await test_non_cca_site(useFeltPrivacyV1);
+  }
 });