Backed out changeset 2a140cd74bae (bug 1749079) for causing bc failur…

…es on browser_verify_l10n_strings.js CLOSED TREE

browser/themes/BuiltInThemeConfig.jsm

@@ -39,54 +39,6 @@ const BuiltInThemeConfig = new Map([
       path: "resource://builtin-themes/alpenglow/",
     },
   ],
-  [
-    "[email protected]",
-    {
-      version: "1.0",
-      path: "resource://builtin-themes/monochromatic/2022red/",
-      expiry: "2022-05-03",
-    },
-  ],
-  [
-    "[email protected]",
-    {
-      version: "1.0",
-      path: "resource://builtin-themes/monochromatic/2022orange/",
-      expiry: "2022-05-03",
-    },
-  ],
-  [
-    "[email protected]",
-    {
-      version: "1.0",
-      path: "resource://builtin-themes/monochromatic/2022green/",
-      expiry: "2022-05-03",
-    },
-  ],
-  [
-    "[email protected]",
-    {
-      version: "1.0",
-      path: "resource://builtin-themes/monochromatic/2022yellow/",
-      expiry: "2022-05-03",
-    },
-  ],
-  [
-    "[email protected]",
-    {
-      version: "1.0",
-      path: "resource://builtin-themes/monochromatic/2022purple/",
-      expiry: "2022-05-03",
-    },
-  ],
-  [
-    "[email protected]",
-    {
-      version: "1.0",
-      path: "resource://builtin-themes/monochromatic/2022blue/",
-      expiry: "2022-05-03",
-    },
-  ],
   [
     "[email protected]",
     {

browser/themes/BuiltInThemes.jsm

@@ -62,15 +62,6 @@ class _BuiltInThemes {
     return null;
   }
 
-  /**
-   * @param {string} id An addon's id string.
-   * @return {boolean}
-   *   True if the theme with id `id` is a monochromatic theme.
-   */
-  isMonochromaticTheme(id) {
-    return id.endsWith("[email protected]");
-  }
-
   /**
    * If the active theme is built-in, this function calls
    * AddonManager.maybeInstallBuiltinAddon for that theme.
@@ -100,8 +91,6 @@ class _BuiltInThemes {
     installPromises.push(this._uninstallExpiredThemes());
 
     const now = new Date();
-    this.monochromaticSortIndices = new Map();
-    let monochromaticSortIndex = 0;
     for (let [id, themeInfo] of this.builtInThemeMap.entries()) {
       if (
         !themeInfo.expiry ||
@@ -115,12 +104,6 @@ class _BuiltInThemes {
             themeInfo.path
           )
         );
-        if (this.isMonochromaticTheme(id)) {
-          // Monochromatic themes get sorted in the UI according to their
-          // position in the config, implied by this loop over
-          // builtInThemeMap.entries().
-          this.monochromaticSortIndices.set(id, monochromaticSortIndex++);
-        }
       }
     }
 

browser/themes/addons/jar.mn

@@ -52,15 +52,3 @@ browser.jar:
   content/builtin-themes/monochromatic/foto/balanced/manifest.json        (monochromatic/foto/balanced/manifest.json)
   content/builtin-themes/monochromatic/foto/bold                          (monochromatic/foto/bold/*.svg)
   content/builtin-themes/monochromatic/foto/bold/manifest.json            (monochromatic/foto/bold/manifest.json)
-  content/builtin-themes/monochromatic/2022blue                   (monochromatic/2022blue/*.svg)
-  content/builtin-themes/monochromatic/2022blue/manifest.json     (monochromatic/2022blue/manifest.json)
-  content/builtin-themes/monochromatic/2022green                  (monochromatic/2022green/*.svg)
-  content/builtin-themes/monochromatic/2022green/manifest.json    (monochromatic/2022green/manifest.json)
-  content/builtin-themes/monochromatic/2022orange                 (monochromatic/2022orange/*.svg)
-  content/builtin-themes/monochromatic/2022orange/manifest.json   (monochromatic/2022orange/manifest.json)
-  content/builtin-themes/monochromatic/2022purple                 (monochromatic/2022purple/*.svg)
-  content/builtin-themes/monochromatic/2022purple/manifest.json   (monochromatic/2022purple/manifest.json)
-  content/builtin-themes/monochromatic/2022red                    (monochromatic/2022red/*.svg)
-  content/builtin-themes/monochromatic/2022red/manifest.json      (monochromatic/2022red/manifest.json)
-  content/builtin-themes/monochromatic/2022yellow                 (monochromatic/2022yellow/*.svg)
-  content/builtin-themes/monochromatic/2022yellow/manifest.json   (monochromatic/2022yellow/manifest.json)