Revert "Bug 1957460 - Update themes on about:editprofile. r=profiles-reviewers,fluent-reviewers,bolsson,tbersentes" for causing bc failures browser_edit_profile_test.js and browser_create_profile_page_test.js

This reverts commit 07a28b4.

Author: Norisz Fay

browser/components/profiles/ProfilesParent.sys.mjs

@@ -11,218 +11,136 @@ const PROFILE_THEMES_MAP = new Map([
   [
     "firefox-compact-light@mozilla.org",
     {
-      dataL10nId: "profiles-gray-theme",
+      dataL10nId: "profiles-light-theme",
       colors: {
-        light: {
-          chromeColor: "rgb(234, 234, 237)", // frame
-          toolbarColor: "rgb(255, 255, 255)", // sidebar?
-          contentColor: "#F9F9FB", // ntp_background
-        },
+        chromeColor: "#F0F0F4",
+        toolbarColor: "#F9F9FB",
+        contentColor: "#FFFFFF",
       },
       isDark: false,
       useInAutomation: true,
     },
   ],
   [
-    "firefox-compact-dark@mozilla.org",
-    {
-      dataL10nId: "profiles-gray-theme",
-      colors: {
-        dark: {
-          chromeColor: "rgb(28, 27, 34)",
-          toolbarColor: "rgb(28, 27, 34)",
-          contentColor: "rgb(43, 42, 51)",
-        },
-      },
-      isDark: true,
-      useInAutomation: true,
-    },
-  ],
-  [
-    "{cd6791f7-4b6d-47b4-8877-1d4c82c6699d}",
-    {
-      dataL10nId: "profiles-yellow-theme",
-      downloadURL:
-        "https://addons.mozilla.org/firefox/downloads/file/4552782/profiles_yellow-1.0.xpi",
-      colors: {
-        light: {
-          chromeColor: "rgb(255, 230, 153)",
-          toolbarColor: "rgb(255, 255, 255)",
-          contentColor: "rgb(255, 244, 208)",
-        },
-        dark: {
-          chromeColor: "rgb(39, 16, 0)",
-          toolbarColor: "rgb(22, 22, 22)",
-          contentColor: "rgb(66, 27, 0)",
-        },
-      },
-    },
-  ],
-  [
-    "{7a301b7b-c3e2-40bf-a06b-6d517bbf138b}",
+    "{b90acfd0-f0fc-4add-9195-f6306d25cdfa}",
     {
-      dataL10nId: "profiles-orange-theme",
+      dataL10nId: "profiles-marigold-theme-2",
       downloadURL:
-        "https://addons.mozilla.org/firefox/downloads/file/4552788/profiles_orange-1.0.xpi",
+        "https://addons.mozilla.org/firefox/downloads/file/4381985/marigold-1.9.xpi",
       colors: {
-        light: {
-          chromeColor: "rgb(255, 205, 158)",
-          toolbarColor: "rgb(255, 255, 255)",
-          contentColor: "rgb(255, 237, 214)",
-        },
-        dark: {
-          chromeColor: "rgb(39, 15, 0)",
-          toolbarColor: "rgb(22, 22, 22)",
-          contentColor: "rgb(72, 18, 0)",
-        },
+        chromeColor: "#F1CA52",
+        toolbarColor: "#FBDF8C",
+        contentColor: "#FEF7E0",
       },
+      isDark: false,
     },
   ],
   [
-    "{8de5f8c3-bfc2-443b-9913-7bbadbd1ba0d}",
+    "{388d9fae-8a28-4f9f-9aad-fb9e84e4f3c3}",
     {
-      dataL10nId: "profiles-red-theme",
+      dataL10nId: "profiles-lichen-theme-2",
       downloadURL:
-        "https://addons.mozilla.org/firefox/downloads/file/4552785/profiles_red-1.0.xpi",
+        "https://addons.mozilla.org/firefox/downloads/file/4381979/lichen_soft-1.3.xpi",
       colors: {
-        light: {
-          chromeColor: "rgb(255, 195, 201)",
-          toolbarColor: "rgb(255, 255, 255)",
-          contentColor: "rgb(255, 232, 234)",
-        },
-        dark: {
-          chromeColor: "rgb(41, 11, 15)",
-          toolbarColor: "rgb(22, 22, 22)",
-          contentColor: "rgb(76, 5, 22)",
-        },
+        chromeColor: "#D2E4DA",
+        toolbarColor: "#E9F2EC",
+        contentColor: "#F5F9F7",
       },
+      isDark: false,
     },
   ],
   [
-    "{2b0fadbf-238d-43db-aa9d-e06c9a7e000b}",
+    "{3ac3b0d7-f017-40e1-b142-a26f794e7015}",
     {
-      dataL10nId: "profiles-pink-theme",
+      dataL10nId: "profiles-magnolia-theme-2",
       downloadURL:
-        "https://addons.mozilla.org/firefox/downloads/file/4552787/profiles_pink-1.0.xpi",
+        "https://addons.mozilla.org/firefox/downloads/file/4381978/magnolia-1.1.xpi",
       colors: {
-        light: {
-          chromeColor: "rgb(255, 194, 219)",
-          toolbarColor: "rgb(255, 255, 255)",
-          contentColor: "rgb(255, 232, 244)",
-        },
-        dark: {
-          chromeColor: "rgb(39, 11, 21)",
-          toolbarColor: "rgb(22, 22, 22)",
-          contentColor: "rgb(73, 6, 36)",
-        },
+        chromeColor: "#FB5B9E",
+        toolbarColor: "#F986B6",
+        contentColor: "#FBE0ED",
       },
+      isDark: false,
     },
   ],
   [
-    "{1d73a1eb-128d-4e9e-83f8-c0c51f8c5fd3}",
+    "{ba48d251-0732-45c2-9f2f-39c68e82d047}",
     {
-      dataL10nId: "profiles-purple-theme",
+      dataL10nId: "profiles-lavender-theme-2",
       downloadURL:
-        "https://addons.mozilla.org/firefox/downloads/file/4552786/profiles_purple-1.0.xpi",
+        "https://addons.mozilla.org/firefox/downloads/file/4381983/lavender_soft-1.2.xpi",
       colors: {
-        light: {
-          chromeColor: "rgb(247, 202, 255)",
-          toolbarColor: "rgb(255, 255, 255)",
-          contentColor: "rgb(255, 236, 255)",
-        },
-        dark: {
-          chromeColor: "rgb(30, 14, 37)",
-          toolbarColor: "rgb(22, 22, 22)",
-          contentColor: "rgb(56, 17, 71)",
-        },
+        chromeColor: "#CDC1EA",
+        toolbarColor: "#EBE4FA",
+        contentColor: "#F4F0FD",
       },
+      isDark: false,
     },
   ],
   [
-    "{aab1adac-5449-47fd-b836-c2f43dc28f3f}",
+    "firefox-compact-dark@mozilla.org",
     {
-      dataL10nId: "profiles-violet-theme",
-      downloadURL:
-        "https://addons.mozilla.org/firefox/downloads/file/4552784/profiles_violet-1.0.xpi",
+      dataL10nId: "profiles-dark-theme",
       colors: {
-        light: {
-          chromeColor: "rgb(221, 207, 255)",
-          toolbarColor: "rgb(255, 255, 255)",
-          contentColor: "rgb(244, 240, 255)",
-        },
-        dark: {
-          chromeColor: "rgb(22, 17, 43)",
-          toolbarColor: "rgb(22, 22, 22)",
-          contentColor: "rgb(40, 25, 83)",
-        },
+        chromeColor: "#1C1B22",
+        toolbarColor: "#2B2A33",
+        contentColor: "#42414D",
       },
+      isDark: true,
+      useInAutomation: true,
     },
   ],
   [
-    "{4223a94a-d3f9-40e9-95dd-99aca80ea04b}",
+    "{750fa518-b61f-4068-9974-330dcf45442f}",
     {
-      dataL10nId: "profiles-blue-theme",
+      dataL10nId: "profiles-ocean-theme-2",
       downloadURL:
-        "https://addons.mozilla.org/firefox/downloads/file/4551961/profiles_blue-1.0.xpi",
+        "https://addons.mozilla.org/firefox/downloads/file/4381977/ocean_dark-1.1.xpi",
       colors: {
-        light: {
-          chromeColor: "rgb(171, 223, 255)",
-          toolbarColor: "rgb(255, 255, 255)",
-          contentColor: "rgb(226, 247, 255)",
-        },
-        dark: {
-          chromeColor: "rgb(8, 21, 44)",
-          toolbarColor: "rgb(22, 22, 22)",
-          contentColor: "rgb(4, 35, 86)",
-        },
+        chromeColor: "#080D33",
+        toolbarColor: "#050D5B",
+        contentColor: "#000511",
       },
+      isDark: true,
     },
   ],
   [
-    "{7063abff-a690-4b87-a548-fc32d3ce5708}",
+    "{25b5a343-4238-4bae-b1f9-93a33f258167}",
     {
-      dataL10nId: "profiles-green-theme",
+      dataL10nId: "profiles-terracotta-theme-2",
       downloadURL:
-        "https://addons.mozilla.org/firefox/downloads/file/4552789/profiles_green-1.0.xpi",
+        "https://addons.mozilla.org/firefox/downloads/file/4381976/terracotta_dark-1.1.xpi",
       colors: {
-        light: {
-          chromeColor: "rgb(181, 240, 181)",
-          toolbarColor: "rgb(255, 255, 255)",
-          contentColor: "rgb(225, 255, 225)",
-        },
-        dark: {
-          chromeColor: "rgb(5, 28, 7)",
-          toolbarColor: "rgb(22, 22, 22)",
-          contentColor: "rgb(0, 50, 0)",
-        },
+        chromeColor: "#591305",
+        toolbarColor: "#98240B",
+        contentColor: "#060100",
       },
+      isDark: true,
     },
   ],
   [
-    "{0683b144-0d4a-4815-963e-55a8ec8d386b}",
+    "{f9261f02-c03c-4352-92ee-78dd8b41ca98}",
     {
-      dataL10nId: "profiles-cyan-theme",
+      dataL10nId: "profiles-moss-theme-2",
       downloadURL:
-        "https://addons.mozilla.org/firefox/downloads/file/4552790/profiles_cyan-1.0.xpi",
+        "https://addons.mozilla.org/firefox/downloads/file/4381975/moss_dark-1.1.xpi",
       colors: {
-        light: {
-          chromeColor: "rgb(166, 236, 244)",
-          toolbarColor: "rgb(255, 255, 255)",
-          contentColor: "rgb(207, 255, 255)",
-        },
-        dark: {
-          chromeColor: "rgb(0, 31, 43)",
-          toolbarColor: "rgb(22, 22, 22)",
-          contentColor: "rgb(0, 50, 61)",
-        },
+        chromeColor: "#405948",
+        toolbarColor: "#5B7B65",
+        contentColor: "#323433",
       },
+      isDark: true,
     },
   ],
   [
     "default-theme@mozilla.org",
     {
       dataL10nId: "profiles-system-theme",
-      colors: {},
+      colors: {
+        chromeColor: "#1C1B22",
+        toolbarColor: "#2B2A33",
+        contentColor: "#42414D",
+      },
     },
   ],
 ]);
@@ -258,12 +176,12 @@ export class ProfilesParent extends JSWindowActorParent {
     favicon.classList.remove("profiles-tab");
   }
 
-  async #getProfileContent(isDark) {
+  async #getProfileContent() {
     // Make sure SelectableProfileService is initialized
     await SelectableProfileService.init();
     let currentProfile = SelectableProfileService.currentProfile;
     let profiles = await SelectableProfileService.getAllProfiles();
-    let themes = await this.getSafeForContentThemes(isDark);
+    let themes = await this.getSafeForContentThemes();
     return {
       currentProfile: await currentProfile.toContentSafeObject(),
       profiles: await Promise.all(profiles.map(p => p.toContentSafeObject())),
@@ -318,17 +236,11 @@ export class ProfilesParent extends JSWindowActorParent {
       }
       case "Profiles:GetNewProfileContent": {
         Glean.profilesNew.displayed.record();
-        let isDark = gBrowser.selectedBrowser.ownerGlobal.matchMedia(
-          "(-moz-system-dark-theme)"
-        ).matches;
-        return this.#getProfileContent(isDark);
+        return this.#getProfileContent();
       }
       case "Profiles:GetEditProfileContent": {
         Glean.profilesExisting.displayed.record();
-        let isDark = gBrowser.selectedBrowser.ownerGlobal.matchMedia(
-          "(-moz-system-dark-theme)"
-        ).matches;
-        return this.#getProfileContent(isDark);
+        return this.#getProfileContent();
       }
       case "Profiles:MoreThemes": {
         if (message.data.source === "about:editprofile") {
@@ -482,20 +394,16 @@ export class ProfilesParent extends JSWindowActorParent {
     await theme.enable();
   }
 
-  async getSafeForContentThemes(isDark) {
-    let lightDark = isDark ? "dark" : "light";
+  async getSafeForContentThemes() {
     let themes = [];
     for (let [themeId, themeObj] of PROFILE_THEMES_MAP) {
-      if (Object.hasOwn(themeObj, "isDark") && themeObj.isDark !== isDark) {
-        continue;
-      }
-
       let theme = await lazy.AddonManager.getAddonByID(themeId);
       themes.push({
         id: themeId,
         dataL10nId: themeObj.dataL10nId,
         isActive: theme?.isActive ?? false,
-        ...themeObj.colors[lightDark],
+        ...themeObj.colors,
+        isDark: themeObj.isDark,
         useInAutomation: themeObj?.useInAutomation,
       });
     }

browser/components/profiles/content/new-profile-card.mjs

@@ -48,7 +48,8 @@ export class NewProfileCard extends EditProfileCard {
       return;
     }
 
-    let possibleThemes = this.themes;
+    let isDark = window.matchMedia("(prefers-color-scheme: dark)").matches;
+    let possibleThemes = this.themes.filter(t => t.isDark === isDark);
     if (isInAutomation) {
       possibleThemes = possibleThemes.filter(t => t.useInAutomation);
     }

browser/components/profiles/tests/browser/browser_create_profile_page_test.js

@@ -277,7 +277,7 @@ add_task(async function test_new_profile_theme() {
   );
   await lightTheme.enable();
 
-  let expectedThemeId = "default-theme@mozilla.org";
+  let expectedThemeId = "firefox-compact-dark@mozilla.org";
 
   is(
     null,
@@ -305,19 +305,17 @@ add_task(async function test_new_profile_theme() {
         // Fill in the input so we don't hit the beforeunload warning
         newProfileCard.nameInput.value = "test";
 
-        let defaultThemeCard = newProfileCard.themesPicker.querySelector(
-          "moz-visual-picker-item[value='default-theme@mozilla.org']"
-        );
+        let darkThemeCard = newProfileCard.themeCards[5];
 
         Assert.ok(
-          !defaultThemeCard.checked,
-          "Default theme chip should not be selected"
+          !darkThemeCard.checked,
+          "Dark theme chip should not be selected"
         );
-        EventUtils.synthesizeMouseAtCenter(defaultThemeCard, {}, content);
+        EventUtils.synthesizeMouseAtCenter(darkThemeCard, {}, content);
 
         await newProfileCard.updateComplete;
         await ContentTaskUtils.waitForCondition(
-          () => defaultThemeCard.checked,
+          () => darkThemeCard.checked,
           "Waiting for the new theme chip to be selected"
         );