httpsgithu · pull · Oct 21, 2021 · Oct 21, 2021 · Oct 21, 2021 · Oct 21, 2021
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
@@ -629,11 +629,6 @@ pref("browser.tabs.tabMinWidth", 76);
 // secondary text on tabs hidden due to size constraints and readability
 // of the text at small font sizes.
 pref("browser.tabs.secondaryTextUnsupportedLocales", "ar,bn,bo,ckb,fa,gu,he,hi,ja,km,kn,ko,lo,mr,my,ne,pa,si,ta,te,th,ur,zh");
-// Initial titlebar state is managed by -moz-gtk-csd-hide-titlebar-by-default
-// on Linux.
-#ifndef UNIX_BUT_NOT_MAC
-  pref("browser.tabs.drawInTitlebar", true);
-#endif
 
 //Control the visibility of Tab Manager Menu.
 pref("browser.tabs.tabmanager.enabled", false);

diff --git a/browser/base/content/browser-tabsintitlebar.js b/browser/base/content/browser-tabsintitlebar.js
@@ -54,10 +54,7 @@ var TabsInTitlebar = {
   _prefName: "browser.tabs.drawInTitlebar",
 
   _readPref() {
-    let hiddenTitlebar = Services.prefs.getBoolPref(
-      "browser.tabs.drawInTitlebar",
-      window.matchMedia("(-moz-gtk-csd-hide-titlebar-by-default)").matches
-    );
+    let hiddenTitlebar = Services.appinfo.drawInTitlebar;
     this.allowedBy("pref", hiddenTitlebar);
   },
 

diff --git a/browser/base/content/test/performance/browser_startup_syncIPC.js b/browser/base/content/test/performance/browser_startup_syncIPC.js
@@ -288,6 +288,13 @@ const startupPhases = {
       ignoreIfUnused: true,
       maxCount: 2,
     },
+    // Added for the search-detection built-in add-on.
+    {
+      name: "PGPU::Msg_AddLayerTreeIdMapping",
+      condition: WIN,
+      ignoreIfUnused: true,
+      maxCount: 1,
+    },
   ],
 };
 

diff --git a/browser/base/content/test/popups/browser_popupUI.js b/browser/base/content/test/popups/browser_popupUI.js
@@ -61,8 +61,8 @@ add_task(async function titlebar_buttons_visibility() {
   Services.prefs.setIntPref("browser.link.open_newwindow", 2);
 
   const drawInTitlebarValues = [
-    [true, BUTTONS_MAY_VISIBLE],
-    [false, BUTTONS_NEVER_VISIBLE],
+    [1, BUTTONS_MAY_VISIBLE],
+    [0, BUTTONS_NEVER_VISIBLE],
   ];
   const windowFeaturesValues = [
     // Opens a popup
@@ -77,7 +77,7 @@ add_task(async function titlebar_buttons_visibility() {
   const menuBarShownValues = [true, false];
 
   for (const [drawInTitlebar, drawInTitlebarButtons] of drawInTitlebarValues) {
-    Services.prefs.setBoolPref("browser.tabs.drawInTitlebar", drawInTitlebar);
+    Services.prefs.setIntPref("browser.tabs.drawInTitlebar", drawInTitlebar);
 
     for (const [
       windowFeatures,

diff --git a/browser/base/content/test/startup/browser_preXULSkeletonUIRegistry.js b/browser/base/content/test/startup/browser_preXULSkeletonUIRegistry.js
@@ -71,7 +71,7 @@ add_task(async function testWritesEnabledOnPrefChange() {
   is(enabled, 0, "Pre-XUL skeleton UI is disabled in the Windows registry");
 
   Services.prefs.setBoolPref("browser.startup.preXulSkeletonUI", true);
-  Services.prefs.setBoolPref("browser.tabs.drawInTitlebar", false);
+  Services.prefs.setIntPref("browser.tabs.drawInTitlebar", 0);
   enabled = WindowsRegistry.readRegKey(
     Ci.nsIWindowsRegKey.ROOT_KEY_CURRENT_USER,
     "Software\\Mozilla\\Firefox\\PreXULSkeletonUISettings",

diff --git a/browser/base/content/test/static/browser_all_files_referenced.js b/browser/base/content/test/static/browser_all_files_referenced.js
@@ -467,6 +467,12 @@ async function parseJsonManifest(uri) {
     return uri;
   }
 
+  if (data.background?.scripts) {
+    for (let bgscript of data.background.scripts) {
+      gReferencesFromCode.set(uri.resolve(bgscript), null);
+    }
+  }
+
   if (data.icons) {
     for (let icon of Object.values(data.icons)) {
       gReferencesFromCode.set(uri.resolve(icon), null);
@@ -479,6 +485,10 @@ async function parseJsonManifest(uri) {
         let script = uri.resolve(api.parent.script);
         gReferencesFromCode.set(script, null);
       }
+
+      if (api.schema) {
+        gReferencesFromCode.set(uri.resolve(api.schema), null);
+      }
     }
   }
 

diff --git a/browser/components/BrowserGlue.jsm b/browser/components/BrowserGlue.jsm
@@ -800,10 +800,7 @@ let JSWINDOWACTORS = {
   );
 
   // Hide the titlebar if the actual browser window will draw in it.
-  let hiddenTitlebar = Services.prefs.getBoolPref(
-    "browser.tabs.drawInTitlebar",
-    win.matchMedia("(-moz-gtk-csd-hide-titlebar-by-default)").matches
-  );
+  let hiddenTitlebar = Services.appinfo.drawInTitlebar;
   if (hiddenTitlebar) {
     win.windowUtils.setChromeMargin(0, 2, 2, 2);
   }
@@ -1244,9 +1241,6 @@ BrowserGlue.prototype = {
     if (AppConstants.platform == "win") {
       JawsScreenReaderVersionCheck.init();
     }
-
-    // This value is to limit collecting Places telemetry once per session.
-    this._placesTelemetryGathered = false;
   },
 
   // cleanup (called on application shutdown)
@@ -1700,14 +1694,6 @@ BrowserGlue.prototype = {
 
     this._collectStartupConditionsTelemetry();
 
-    if (!this._placesTelemetryGathered && TelemetryUtils.isTelemetryEnabled) {
-      this._placesTelemetryGathered = true;
-      // Collect Places telemetry on the first idle.
-      Services.tm.idleDispatchToMainThread(() => {
-        PlacesDBUtils.telemetry();
-      });
-    }
-
     // Set the default favicon size for UI views that use the page-icon protocol.
     PlacesUtils.favicons.setDefaultIconURIPreferredSize(
       16 * aWindow.devicePixelRatio
@@ -2063,6 +2049,25 @@ BrowserGlue.prototype = {
     _checkTranslationsPref();
   },
 
+  async _setupSearchDetection() {
+    // There is no pref for this add-on because it shouldn't be disabled.
+    const ID = "addons-search-detection@mozilla.com";
+
+    let addon = await AddonManager.getAddonByID(ID);
+
+    // first time install of addon and install on firefox update
+    addon =
+      (await AddonManager.maybeInstallBuiltinAddon(
+        ID,
+        "2.0.0",
+        "resource://builtin-addons/search-detection/"
+      )) || addon;
+
+    if (!addon.isActive) {
+      addon.enable();
+    }
+  },
+
   _monitorHTTPSOnlyPref() {
     const PREF_ENABLED = "dom.security.https_only_mode";
     const PREF_WAS_ENABLED = "dom.security.https_only_mode_ever_enabled";
@@ -2295,6 +2300,8 @@ BrowserGlue.prototype = {
     this._monitorHTTPSOnlyPref();
     this._monitorIonPref();
     this._monitorIonStudies();
+    this._setupSearchDetection();
+
     if (AppConstants.NIGHTLY_BUILD) {
       this._monitorTranslationsPref();
     }
@@ -2348,6 +2355,13 @@ BrowserGlue.prototype = {
         },
       },
 
+      {
+        condition: TelemetryUtils.isTelemetryEnabled,
+        task: () => {
+          PlacesDBUtils.telemetry().catch(console.error);
+        },
+      },
+
       // Begin listening for incoming push messages.
       {
         task: () => {

diff --git a/browser/components/customizableui/CustomizableUI.jsm b/browser/components/customizableui/CustomizableUI.jsm
@@ -3151,12 +3151,8 @@ var CustomizableUIInternal = {
 
   _resetUIState() {
     try {
-      // kPrefDrawInTitlebar may not be defined on Linux/Gtk+ which throws an exception
-      // and leads to whole test failure. Let's set a fallback default value to avoid that,
-      // both titlebar states are tested anyway and it's not important which state is tested first.
-      gUIStateBeforeReset.drawInTitlebar = Services.prefs.getBoolPref(
-        kPrefDrawInTitlebar,
-        false
+      gUIStateBeforeReset.drawInTitlebar = Services.prefs.getIntPref(
+        kPrefDrawInTitlebar
       );
       gUIStateBeforeReset.uiCustomizationState = Services.prefs.getCharPref(
         kPrefCustomizationState
@@ -3246,7 +3242,7 @@ var CustomizableUIInternal = {
     this._clearPreviousUIState();
 
     Services.prefs.setCharPref(kPrefCustomizationState, uiCustomizationState);
-    Services.prefs.setBoolPref(kPrefDrawInTitlebar, drawInTitlebar);
+    Services.prefs.setIntPref(kPrefDrawInTitlebar, drawInTitlebar);
     Services.prefs.setIntPref(kPrefUIDensity, uiDensity);
     Services.prefs.setBoolPref(kPrefAutoTouchMode, autoTouchMode);
     Services.prefs.setBoolPref(

diff --git a/browser/components/customizableui/CustomizeMode.jsm b/browser/components/customizableui/CustomizeMode.jsm
@@ -1715,10 +1715,7 @@ CustomizeMode.prototype = {
   },
 
   _updateTitlebarCheckbox() {
-    let drawInTitlebar = Services.prefs.getBoolPref(
-      kDrawInTitlebarPref,
-      this.window.matchMedia("(-moz-gtk-csd-hide-titlebar-by-default)").matches
-    );
+    let drawInTitlebar = Services.appinfo.drawInTitlebar;
     let checkbox = this.$("customization-titlebar-visibility-checkbox");
     // Drawing in the titlebar means 'hiding' the titlebar.
     // We use the attribute rather than a property because if we're not in
@@ -1732,7 +1729,7 @@ CustomizeMode.prototype = {
 
   toggleTitlebar(aShouldShowTitlebar) {
     // Drawing in the titlebar means not showing the titlebar, hence the negation:
-    Services.prefs.setBoolPref(kDrawInTitlebarPref, !aShouldShowTitlebar);
+    Services.prefs.setIntPref(kDrawInTitlebarPref, !aShouldShowTitlebar);
   },
 
   _getBoundsWithoutFlushing(element) {

diff --git a/browser/components/customizableui/test/browser_970511_undo_restore_default.js b/browser/components/customizableui/test/browser_970511_undo_restore_default.js
@@ -142,11 +142,16 @@ add_task(async function() {
 
 // Bug 971626 - Restore Defaults should collapse the Title Bar
 add_task(async function() {
-  if (Services.appinfo.OS != "WINNT" && Services.appinfo.OS != "Darwin") {
-    return;
+  {
+    const supported = TabsInTitlebar.systemSupported;
+    is(typeof supported, "boolean");
+    info("TabsInTitlebar support: " + supported);
+    if (!supported) {
+      return;
+    }
   }
-  let prefName = "browser.tabs.drawInTitlebar";
-  let defaultValue = Services.prefs.getBoolPref(prefName);
+
+  const kDefaultValue = Services.appinfo.drawInTitlebar;
   let restoreDefaultsButton = document.getElementById(
     "customization-reset-button"
   );
@@ -166,7 +171,7 @@ add_task(async function() {
   );
   is(
     titlebarCheckbox.hasAttribute("checked"),
-    !defaultValue,
+    !kDefaultValue,
     "Title bar checkbox should reflect pref value"
   );
   is(
@@ -175,14 +180,20 @@ add_task(async function() {
     "Undo reset button should be hidden at start of test"
   );
 
-  Services.prefs.setBoolPref(prefName, !defaultValue);
+  let prefName = "browser.tabs.drawInTitlebar";
+  Services.prefs.setIntPref(prefName, !kDefaultValue);
   ok(
     !restoreDefaultsButton.disabled,
     "Restore defaults button should be enabled when pref changed"
   );
+  is(
+    Services.appinfo.drawInTitlebar,
+    !kDefaultValue,
+    "Title bar checkbox should reflect changed pref value"
+  );
   is(
     titlebarCheckbox.hasAttribute("checked"),
-    defaultValue,
+    kDefaultValue,
     "Title bar checkbox should reflect changed pref value"
   );
   ok(
@@ -202,14 +213,19 @@ add_task(async function() {
   );
   is(
     titlebarCheckbox.hasAttribute("checked"),
-    !defaultValue,
+    !kDefaultValue,
     "Title bar checkbox should reflect default value after reset"
   );
   is(
-    Services.prefs.getBoolPref(prefName),
-    defaultValue,
+    Services.prefs.getIntPref(prefName),
+    2,
     "Reset should reset drawInTitlebar"
   );
+  is(
+    Services.appinfo.drawInTitlebar,
+    kDefaultValue,
+    "Default state should be restored"
+  );
   ok(CustomizableUI.inDefaultState, "In default state after titlebar reset");
   is(
     undoResetButton.hidden,
@@ -228,13 +244,13 @@ add_task(async function() {
   );
   is(
     titlebarCheckbox.hasAttribute("checked"),
-    defaultValue,
+    kDefaultValue,
     "Title bar checkbox should reflect undo-reset value"
   );
   ok(!CustomizableUI.inDefaultState, "No longer in default state after undo");
   is(
-    Services.prefs.getBoolPref(prefName),
-    !defaultValue,
+    Services.prefs.getIntPref(prefName),
+    kDefaultValue ? 0 : 1,
     "Undo-reset goes back to previous pref value"
   );
   is(

diff --git a/browser/extensions/moz.build b/browser/extensions/moz.build
@@ -12,6 +12,7 @@ DIRS += [
     "report-site-issue",
     "pictureinpicture",
     "proxy-failover",
+    "search-detection",
 ]
 
 if CONFIG["NIGHTLY_BUILD"]: