Commit 7b36c8b8 authored by Norisz Fay's avatar Norisz Fay
Browse files

Merge autoland to mozilla-central a=merge

parents b94f0c15 e537e97f

.eslintignore

+3 −0
Original line number Diff line number Diff line
@@ -42,6 +42,9 @@ browser/components/enterprisepolicies/schemas/schema.jsm 
browser/components/pocket/content/panels/js/tmpl.js

browser/components/pocket/content/panels/js/vendor.bundle.js

browser/components/pocket/content/panels/js/main.bundle.js

# Include the Storybook config files.

!browser/components/storybook/.storybook/

!browser/components/storybook/.storybook/*.js



# Ignore newtab files

browser/components/newtab/aboutwelcome/content/aboutwelcome.bundle.js

browser/components/BrowserContentHandler.jsm

+17 −7
Original line number Diff line number Diff line
@@ -1032,17 +1032,27 @@ nsDefaultCommandLineHandler.prototype = { 
      while (

        (tag = cmdLine.handleFlagWithParam("notification-windowsTag", false))

      ) {

        let onUnknownWindowsTag = (unknownTag, launchUrl) => {

          if (!launchUrl) {

        let onUnknownWindowsTag = (unknownTag, launchUrl, privilegedName) => {

          console.info(

              `Completing Windows notification with tag '${unknownTag}' with no associated launchUrl`

            `Completing Windows notification (tag=${JSON.stringify(

              unknownTag

            )}, launchUrl=${JSON.stringify(

              launchUrl

            )}, privilegedName=${JSON.stringify(privilegedName)}))`

          );

          if (privilegedName) {

            Services.telemetry.setEventRecordingEnabled(

              "browser.launched_to_handle",

              true

            );

            Glean.browserLaunchedToHandle.systemNotification.record({

              name: privilegedName,

            });

          }

          if (!launchUrl) {

            return;

          }

          let uri = resolveURIInternal(cmdLine, launchUrl);

          console.info(

            `Opening ${uri.spec} to complete Windows notification with tag '${unknownTag}'`

          );

          urilist.push(uri);

        };

browser/components/BrowserGlue.jsm

+8 −3
Original line number Diff line number Diff line
@@ -4365,9 +4365,14 @@ BrowserGlue.prototype = { 
        return "disallow-postUpdate";

      }



      return lazy.NimbusFeatures.upgradeDialog.getVariable("enabled")

        ? ""

        : "disabled";

      const useMROnboarding = lazy.NimbusFeatures.majorRelease2022.getVariable(

        "onboarding"

      );

      const showUpgradeDialog =

        useMROnboarding ??

        lazy.NimbusFeatures.upgradeDialog.getVariable("enabled");



      return showUpgradeDialog ? "" : "disabled";

    })();



    // Record why the dialog is showing or not.

browser/components/firefoxview/tab-pickup-list.mjs

+3 −0
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ class TabPickupList extends HTMLElement { 
    ) {

      const item = event.target.closest(".synced-tab-li");

      let index = [...this.tabsList.children].indexOf(item);

      let deviceType = item.dataset.deviceType;

      Services.telemetry.recordEvent(

        "firefoxview",

        "tab_pickup",
@@ -83,6 +84,7 @@ class TabPickupList extends HTMLElement { 
        null,

        {

          position: (++index).toString(),

          deviceType,

        }

      );

    }
@@ -173,6 +175,7 @@ class TabPickupList extends HTMLElement { 
  generateListItem(tab, index) {

    const li = document.createElement("li");

    li.classList.add("synced-tab-li");

    li.dataset.deviceType = tab.deviceType;



    const targetURI = tab.url;

    const a = document.createElement("a");

browser/components/firefoxview/tests/browser/browser_tab_pickup_list.js

+7 −1
Original line number Diff line number Diff line
@@ -73,7 +73,13 @@ const syncedTabsData5 = [ 
const TAB_PICKUP_EVENT = [

  ["firefoxview", "entered", "firefoxview", undefined],

  ["firefoxview", "synced_tabs", "tabs", undefined, { count: "1" }],

  ["firefoxview", "tab_pickup", "tabs", undefined],

  [

    "firefoxview",

    "tab_pickup",

    "tabs",

    undefined,

    { position: "1", deviceType: "desktop" },

  ],

];



const TAB_PICKUP_OPEN_EVENT = [