Revert "Bug 2053447: Part 5 - Update for enterprise policies.r=mkaply" for causing bc failures at /browser_suppressTips.js

This reverts commit 4e82cee.

Revert "Bug 2053447: Part 4 - Update rest of LaunchOnLogin code to use new API.r=omc-reviewers,firefox-desktop-core-reviewers ,aminomancer"

This reverts commit 07e458f.

Revert "Bug 2053447: Part 3 - Update Launch on Login pref to use new API.r=tgiles"

This reverts commit 9f8a694.

Revert "Bug 2053447: Part 2 - Port the existing LaunchOnLogin code.r=hsohaney"

This reverts commit 4a2e7ad.

Revert "Bug 2053447 - Part 1: Create a LaunchOnLogin interface for macOS. r=hsohaney"

This reverts commit 2f90071.

Author: Silaghi

browser/app/profile/firefox.js

@@ -351,14 +351,8 @@ pref("browser.startup.couldRestoreSession.count", 0);
 // users as it is not implemented anywhere else.
 #if defined(XP_WIN)
 pref("browser.startup.preXulSkeletonUI", true);
-#endif
-
-// These are called browser.startup.windowsLaunchOnLogin.* because they originated
-// on Windows, but they now operate on macOS as well.
-// They can't be changed until there are no experiments running that are using the
-// old name - https://bugzilla.mozilla.org/show_bug.cgi?id=2059749
 
-// Whether the checkbox to enable Launch on login is shown
+// Whether the checkbox to enable Windows launch on login is shown
 pref("browser.startup.windowsLaunchOnLogin.enabled", true);
 // Whether to show the launch on login infobar notification
 pref("browser.startup.windowsLaunchOnLogin.disableLaunchOnLoginPrompt", false);
@@ -369,6 +363,7 @@ pref("browser.startup.windowsLaunchOnLogin.disableLaunchOnLoginPrompt", false);
 // direction.
 pref("browser.startup.windowsLaunchOnLogin.defaultEnabled", false);
 pref("browser.startup.windowsLaunchOnLogin.alreadyApplied", false);
+#endif
 
 // Show an upgrade dialog on major upgrades.
 pref("browser.startup.upgradeDialog.enabled", false);

browser/base/content/test/performance/browser_startup.js

@@ -108,12 +108,10 @@ const startupPhases = {
 };
 
 if (AppConstants.platform == "win") {
-  let modules = startupPhases["before profile selection"].allowlist.modules;
-  // we call checkForLaunchOnLogin early in startup.
-  modules.add(
+  // On Windows we call checkForLaunchOnLogin early in startup.
+  startupPhases["before profile selection"].allowlist.modules.add(
     "moz-src:///browser/components/shell/StartupOSIntegration.sys.mjs"
   );
-  modules.add("resource://gre/modules/LaunchOnLogin.sys.mjs");
 }
 
 if (

browser/components/BrowserComponents.manifest

@@ -186,9 +186,9 @@ category browser-idle-startup resource:///modules/UpdatePolicyEnforcer.sys.mjs U
 #endif
 #ifdef XP_WIN
 category browser-idle-startup resource:///modules/WindowsJumpLists.sys.mjs WinTaskbarJumpList.startup
+category browser-idle-startup resource:///modules/DefaultWindowsLaunchOnLogin.sys.mjs DefaultWindowsLaunchOnLogin.maybeEnableOnFirstRun
 #endif
 #if defined(XP_WIN) || defined(XP_MACOSX)
-category browser-idle-startup resource:///modules/DefaultLaunchOnLogin.sys.mjs DefaultLaunchOnLogin.maybeEnableOnFirstRun
 category browser-idle-startup moz-src:///browser/components/shell/StartupOSIntegration.sys.mjs StartupOSIntegration.onStartupIdle
 #endif
 

browser/components/StartupTelemetry.sys.mjs

@@ -12,7 +12,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
   LoginHelper: "resource://gre/modules/LoginHelper.sys.mjs",
   NimbusFeatures: "resource://nimbus/ExperimentAPI.sys.mjs",
   OsEnvironment: "resource://gre/modules/OsEnvironment.sys.mjs",
-  LaunchOnLogin: "resource://gre/modules/LaunchOnLogin.sys.mjs",
+  WindowsLaunchOnLogin: "resource://gre/modules/WindowsLaunchOnLogin.sys.mjs",
   PlacesDBUtils: "resource://gre/modules/PlacesDBUtils.sys.mjs",
   ShellService: "moz-src:///browser/components/shell/ShellService.sys.mjs",
   TelemetryReportingPolicy:
@@ -481,11 +481,12 @@ export let StartupTelemetry = {
 
   async launchOnLoginState() {
     let state;
-    if (!lazy.LaunchOnLogin.isSupported()) {
+    if (AppConstants.platform != "win") {
       state = "not_supported";
     } else {
       try {
-        const enablementDetails = await lazy.LaunchOnLogin.enablementDetails();
+        const enablementDetails =
+          await lazy.WindowsLaunchOnLogin.getLaunchOnLoginEnablementDetails();
         if (enablementDetails.isEnabled) {
           state = "enabled";
         } else if (!enablementDetails.isSupported) {

browser/components/asrouter/modules/ASRouterTargeting.sys.mjs

@@ -86,7 +86,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
   TaskbarTabs: "resource:///modules/taskbartabs/TaskbarTabs.sys.mjs",
   TelemetryEnvironment: "resource://gre/modules/TelemetryEnvironment.sys.mjs",
   TelemetrySession: "resource://gre/modules/TelemetrySession.sys.mjs",
-  LaunchOnLogin: "resource://gre/modules/LaunchOnLogin.sys.mjs",
+  WindowsLaunchOnLogin: "resource://gre/modules/WindowsLaunchOnLogin.sys.mjs",
 });
 
 ChromeUtils.defineLazyGetter(lazy, "fxAccounts", () => {
@@ -1190,20 +1190,20 @@ const TargetingGetters = {
   },
 
   get launchOnLoginEnabled() {
-    if (!lazy.LaunchOnLogin.isSupported()) {
+    if (AppConstants.platform !== "win") {
       return false;
     }
-    return lazy.LaunchOnLogin.isEnabled();
+    return lazy.WindowsLaunchOnLogin.getLaunchOnLoginEnabled();
   },
 
   // Whether launch on login could be enabled, i.e. it isn't overridden by
   // Windows Settings or enterprise policy. Used to avoid offering launch on
   // login to users for whom enabling it would silently no-op.
   get launchOnLoginAllowedByPolicy() {
-    if (!lazy.LaunchOnLogin.isSupported()) {
+    if (AppConstants.platform !== "win") {
       return false;
     }
-    return lazy.LaunchOnLogin.isAllowed();
+    return lazy.WindowsLaunchOnLogin.getLaunchOnLoginApproved();
   },
 
   get isMSIX() {

browser/components/defaultlaunchonlogin/tests/xpcshell.toml

@@ -4,27 +4,25 @@
 
 import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
 
-// These IDs and preferences contain Windows in their name as legacy
-// and changing them to be OS agnostic would break existing installs.
-export const DEFAULT_LAUNCH_ON_LOGIN_NIMBUS_FEATURE_ID =
+export const DEFAULT_WINDOWS_LAUNCH_ON_LOGIN_NIMBUS_FEATURE_ID =
   "defaultWindowsLaunchOnLogin";
 
-export const DEFAULT_LAUNCH_ON_LOGIN_PREF =
+export const DEFAULT_WINDOWS_LAUNCH_ON_LOGIN_PREF =
   "browser.startup.windowsLaunchOnLogin.defaultEnabled";
-export const DEFAULT_LAUNCH_ON_LOGIN_ALREADY_APPLIED_PREF =
+export const DEFAULT_WINDOWS_LAUNCH_ON_LOGIN_ALREADY_APPLIED_PREF =
   "browser.startup.windowsLaunchOnLogin.alreadyApplied";
 
 const lazy = XPCOMUtils.declareLazy({
   AppConstants: "resource://gre/modules/AppConstants.sys.mjs",
   ExperimentAPI: "resource://nimbus/ExperimentAPI.sys.mjs",
-  LaunchOnLogin: "resource://gre/modules/LaunchOnLogin.sys.mjs",
+  WindowsLaunchOnLogin: "resource://gre/modules/WindowsLaunchOnLogin.sys.mjs",
   profileService: {
     service: "@mozilla.org/toolkit/profile-service;1",
     iid: Ci.nsIToolkitProfileService,
   },
 });
 
-export var DefaultLaunchOnLogin = {
+export var DefaultWindowsLaunchOnLogin = {
   /**
    * `browser-idle-startup` category entry point.
    *
@@ -46,7 +44,7 @@ export var DefaultLaunchOnLogin = {
     let isFirstRun = lazy.profileService.isFirstRun;
     let isOfficialBuild = lazy.AppConstants.MOZILLA_OFFICIAL;
     let alreadyApplied = Services.prefs.getBoolPref(
-      DEFAULT_LAUNCH_ON_LOGIN_ALREADY_APPLIED_PREF,
+      DEFAULT_WINDOWS_LAUNCH_ON_LOGIN_ALREADY_APPLIED_PREF,
       false
     );
 
@@ -57,7 +55,6 @@ export var DefaultLaunchOnLogin = {
     ) {
       isFirstRun = true;
       isOfficialBuild = true;
-      alreadyApplied = false;
     }
 
     await this.enableOnFirstRunIfNeeded(
@@ -82,7 +79,7 @@ export var DefaultLaunchOnLogin = {
    */
   async enableOnFirstRunIfNeeded(isFirstRun, isOfficialBuild, alreadyApplied) {
     if (
-      !lazy.LaunchOnLogin.isSupported() ||
+      lazy.AppConstants.platform !== "win" ||
       !isOfficialBuild ||
       !isFirstRun ||
       alreadyApplied
@@ -94,21 +91,23 @@ export var DefaultLaunchOnLogin = {
     // applied its value before we read the pref below.
     await this.waitForNimbusReady();
 
-    if (!Services.prefs.getBoolPref(DEFAULT_LAUNCH_ON_LOGIN_PREF, false)) {
+    if (
+      !Services.prefs.getBoolPref(DEFAULT_WINDOWS_LAUNCH_ON_LOGIN_PREF, false)
+    ) {
       return;
     }
 
     // Mark the launch on login as applied so we don't do it again
     Services.prefs.setBoolPref(
-      DEFAULT_LAUNCH_ON_LOGIN_ALREADY_APPLIED_PREF,
+      DEFAULT_WINDOWS_LAUNCH_ON_LOGIN_ALREADY_APPLIED_PREF,
       true
     );
 
-    if (!(await lazy.LaunchOnLogin.isAllowed())) {
+    if (!(await lazy.WindowsLaunchOnLogin.getLaunchOnLoginApproved())) {
       return;
     }
 
-    await lazy.LaunchOnLogin.enable();
+    await lazy.WindowsLaunchOnLogin.createLaunchOnLogin();
   },
 
   /**

…unchonlogin/DefaultLaunchOnLogin.sys.mjs …ogin/DefaultWindowsLaunchOnLogin.sys.mjsbrowser/components/defaultlaunchonlogin/DefaultLaunchOnLogin.sys.mjs renamed to browser/components/defaultwindowslaunchonlogin/DefaultWindowsLaunchOnLogin.sys.mjs browser/components/defaultlaunchonlogin/DefaultLaunchOnLogin.sys.mjs renamed to browser/components/defaultwindowslaunchonlogin/DefaultWindowsLaunchOnLogin.sys.mjs

@@ -6,7 +6,7 @@ with Files("**"):
     BUG_COMPONENT = ("Firefox", "Shell Integration")
 
 EXTRA_JS_MODULES += [
-    "DefaultLaunchOnLogin.sys.mjs",
+    "DefaultWindowsLaunchOnLogin.sys.mjs",
 ]
 
 XPCSHELL_TESTS_MANIFESTS += ["tests/xpcshell.toml"]