Bug 1733345 - Move theme modules into browser/themes/. r=harry

Differential Revision: https://phabricator.services.mozilla.com/D127090

browser/components/moz.build

@@ -55,7 +55,6 @@ DIRS += [
     "shell",
     "syncedtabs",
     "tabunloader",
-    "themes",
     "translation",
     "uitour",
     "urlbar",

browser/components/themes/moz.build

@@ -1,10 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-with Files("**"):
-    BUG_COMPONENT = ("Firefox", "Theme")
-
-EXTRA_JS_MODULES += [
-    "BuiltInThemes.jsm",
-]

browser/modules/moz.build

@@ -97,15 +97,9 @@ with Files("SitePermissions.jsm"):
 with Files("TabsList.jsm"):
     BUG_COMPONENT = ("Firefox", "Tabbed Browser")
 
-with Files("ThemeVariableMap.jsm"):
-    BUG_COMPONENT = ("WebExtensions", "Themes")
-
 with Files("TransientPrefs.jsm"):
     BUG_COMPONENT = ("Firefox", "Preferences")
 
-with Files("Windows8WindowFrameColor.jsm"):
-    BUG_COMPONENT = ("Firefox", "Theme")
-
 with Files("WindowsJumpLists.jsm"):
     BUG_COMPONENT = ("Firefox", "Shell Integration")
 
@@ -151,7 +145,6 @@ EXTRA_JS_MODULES += [
     "SitePermissions.jsm",
     "TabsList.jsm",
     "TabUnloader.jsm",
-    "ThemeVariableMap.jsm",
     "TransientPrefs.jsm",
     "webrtcUI.jsm",
     "ZoomUI.jsm",
@@ -164,7 +157,6 @@ if CONFIG["MOZ_ASAN_REPORTER"]:
 
 if CONFIG["MOZ_WIDGET_TOOLKIT"] == "windows":
     EXTRA_JS_MODULES += [
-        "Windows8WindowFrameColor.jsm",
         "WindowsJumpLists.jsm",
         "WindowsPreviewPerTab.jsm",
     ]

browser/themes/moz.build

@@ -7,8 +7,21 @@
 with Files("**"):
     BUG_COMPONENT = ("Firefox", "Theme")
 
+with Files("ThemeVariableMap.jsm"):
+    BUG_COMPONENT = ("WebExtensions", "Themes")
+
+EXTRA_JS_MODULES += [
+    "BuiltInThemes.jsm",
+    "ThemeVariableMap.jsm",
+]
+
 toolkit = CONFIG["MOZ_WIDGET_TOOLKIT"]
 
+if toolkit == "windows":
+    EXTRA_JS_MODULES += [
+        "Windows8WindowFrameColor.jsm",
+    ]
+
 if toolkit == "cocoa":
     DIRS += ["osx"]
 elif toolkit == "gtk":