Merge branch 'ext-work'

42 files changed, 20 insertions, 2 deletions

diff --git a/browser/components/moz.build b/browser/components/moz.build
index 3c0dea3fb..0393b6e92 100644
--- a/browser/components/moz.build
+++ b/browser/components/moz.build
@@ -10,7 +10,6 @@ DIRS += [
     'customizableui',
     'dirprovider',
     'downloads',
-    'extensions',
     'feeds',
     'migration',
     'newtab',
@@ -26,6 +25,9 @@ DIRS += [
     'translation',
 ]
 
+if CONFIG['MOZ_WEBEXTENSIONS']:
+    DIRS += ['webextensions']
+
 DIRS += ['build']
 
 XPIDL_SOURCES += [
diff --git a/browser/components/extensions/.eslintrc.js b/browser/components/webextensions/.eslintrc.js
index 81a11c4ac..81a11c4ac 100644
--- a/browser/components/extensions/.eslintrc.js
+++ b/browser/components/webextensions/.eslintrc.js
diff --git a/browser/components/extensions/ext-bookmarks.js b/browser/components/webextensions/ext-bookmarks.js
index 399f6212d..399f6212d 100644
--- a/browser/components/extensions/ext-bookmarks.js
+++ b/browser/components/webextensions/ext-bookmarks.js
diff --git a/browser/components/extensions/ext-browserAction.js b/browser/components/webextensions/ext-browserAction.js
index 2c82ac701..2c82ac701 100644
--- a/browser/components/extensions/ext-browserAction.js
+++ b/browser/components/webextensions/ext-browserAction.js
diff --git a/browser/components/extensions/ext-c-contextMenus.js b/browser/components/webextensions/ext-c-contextMenus.js
index 9fde90808..9fde90808 100644
--- a/browser/components/extensions/ext-c-contextMenus.js
+++ b/browser/components/webextensions/ext-c-contextMenus.js
diff --git a/browser/components/extensions/ext-c-omnibox.js b/browser/components/webextensions/ext-c-omnibox.js
index 3b9b6e2f7..3b9b6e2f7 100644
--- a/browser/components/extensions/ext-c-omnibox.js
+++ b/browser/components/webextensions/ext-c-omnibox.js
diff --git a/browser/components/extensions/ext-c-tabs.js b/browser/components/webextensions/ext-c-tabs.js
index d5ce9fbf9..d5ce9fbf9 100644
--- a/browser/components/extensions/ext-c-tabs.js
+++ b/browser/components/webextensions/ext-c-tabs.js
diff --git a/browser/components/extensions/ext-commands.js b/browser/components/webextensions/ext-commands.js
index 416544e86..416544e86 100644
--- a/browser/components/extensions/ext-commands.js
+++ b/browser/components/webextensions/ext-commands.js
diff --git a/browser/components/extensions/ext-contextMenus.js b/browser/components/webextensions/ext-contextMenus.js
index b3bf8aa53..b3bf8aa53 100644
--- a/browser/components/extensions/ext-contextMenus.js
+++ b/browser/components/webextensions/ext-contextMenus.js
diff --git a/browser/components/extensions/ext-desktop-runtime.js b/browser/components/webextensions/ext-desktop-runtime.js
index 0fdb45562..0fdb45562 100644
--- a/browser/components/extensions/ext-desktop-runtime.js
+++ b/browser/components/webextensions/ext-desktop-runtime.js
diff --git a/browser/components/extensions/ext-history.js b/browser/components/webextensions/ext-history.js
index a47df1621..a47df1621 100644
--- a/browser/components/extensions/ext-history.js
+++ b/browser/components/webextensions/ext-history.js
diff --git a/browser/components/extensions/ext-omnibox.js b/browser/components/webextensions/ext-omnibox.js
index 9b2f60ca4..9b2f60ca4 100644
--- a/browser/components/extensions/ext-omnibox.js
+++ b/browser/components/webextensions/ext-omnibox.js
diff --git a/browser/components/extensions/ext-pageAction.js b/browser/components/webextensions/ext-pageAction.js
index 5bf3a9c70..5bf3a9c70 100644
--- a/browser/components/extensions/ext-pageAction.js
+++ b/browser/components/webextensions/ext-pageAction.js
diff --git a/browser/components/extensions/ext-sessions.js b/browser/components/webextensions/ext-sessions.js
index 4c13a1ac3..4c13a1ac3 100644
--- a/browser/components/extensions/ext-sessions.js
+++ b/browser/components/webextensions/ext-sessions.js
diff --git a/browser/components/extensions/ext-tabs.js b/browser/components/webextensions/ext-tabs.js
index bb575aaab..bb575aaab 100644
--- a/browser/components/extensions/ext-tabs.js
+++ b/browser/components/webextensions/ext-tabs.js
diff --git a/browser/components/extensions/ext-utils.js b/browser/components/webextensions/ext-utils.js
index 75b2f4bd4..75b2f4bd4 100644
--- a/browser/components/extensions/ext-utils.js
+++ b/browser/components/webextensions/ext-utils.js
diff --git a/browser/components/extensions/ext-windows.js b/browser/components/webextensions/ext-windows.js
index 5956ae15b..5956ae15b 100644
--- a/browser/components/extensions/ext-windows.js
+++ b/browser/components/webextensions/ext-windows.js
diff --git a/browser/components/extensions/extension-mac-panel.css b/browser/components/webextensions/extension-mac-panel.css
index 2e9ed6bdb..2e9ed6bdb 100644
--- a/browser/components/extensions/extension-mac-panel.css
+++ b/browser/components/webextensions/extension-mac-panel.css
diff --git a/browser/components/extensions/extension-mac.css b/browser/components/webextensions/extension-mac.css
index 49cd3b359..49cd3b359 100644
--- a/browser/components/extensions/extension-mac.css
+++ b/browser/components/webextensions/extension-mac.css
diff --git a/browser/components/extensions/extension-win-panel.css b/browser/components/webextensions/extension-win-panel.css
index ddafe3ea5..ddafe3ea5 100644
--- a/browser/components/extensions/extension-win-panel.css
+++ b/browser/components/webextensions/extension-win-panel.css
diff --git a/browser/components/extensions/extension.css b/browser/components/webextensions/extension.css
index 6b59033e3..6b59033e3 100644
--- a/browser/components/extensions/extension.css
+++ b/browser/components/webextensions/extension.css
diff --git a/browser/components/extensions/extension.svg b/browser/components/webextensions/extension.svg
index a16455253..a16455253 100644
--- a/browser/components/extensions/extension.svg
+++ b/browser/components/webextensions/extension.svg
diff --git a/browser/components/extensions/extensions-browser.manifest b/browser/components/webextensions/extensions-browser.manifest
index ed5cca813..ed5cca813 100644
--- a/browser/components/extensions/extensions-browser.manifest
+++ b/browser/components/webextensions/extensions-browser.manifest
diff --git a/browser/components/extensions/jar.mn b/browser/components/webextensions/jar.mn
index a7b506ec4..a7b506ec4 100644
--- a/browser/components/extensions/jar.mn
+++ b/browser/components/webextensions/jar.mn
diff --git a/browser/components/extensions/moz.build b/browser/components/webextensions/moz.build
index 116e90415..116e90415 100644
--- a/browser/components/extensions/moz.build
+++ b/browser/components/webextensions/moz.build
diff --git a/browser/components/extensions/schemas/LICENSE b/browser/components/webextensions/schemas/LICENSE
index 9314092fd..9314092fd 100644
--- a/browser/components/extensions/schemas/LICENSE
+++ b/browser/components/webextensions/schemas/LICENSE
diff --git a/browser/components/extensions/schemas/bookmarks.json b/browser/components/webextensions/schemas/bookmarks.json
index fb74c633e..fb74c633e 100644
--- a/browser/components/extensions/schemas/bookmarks.json
+++ b/browser/components/webextensions/schemas/bookmarks.json
diff --git a/browser/components/extensions/schemas/browser_action.json b/browser/components/webextensions/schemas/browser_action.json
index 1a7da956a..1a7da956a 100644
--- a/browser/components/extensions/schemas/browser_action.json
+++ b/browser/components/webextensions/schemas/browser_action.json
diff --git a/browser/components/extensions/schemas/commands.json b/browser/components/webextensions/schemas/commands.json
index a1632088e..a1632088e 100644
--- a/browser/components/extensions/schemas/commands.json
+++ b/browser/components/webextensions/schemas/commands.json
diff --git a/browser/components/extensions/schemas/context_menus.json b/browser/components/webextensions/schemas/context_menus.json
index b31af51f3..b31af51f3 100644
--- a/browser/components/extensions/schemas/context_menus.json
+++ b/browser/components/webextensions/schemas/context_menus.json
diff --git a/browser/components/extensions/schemas/context_menus_internal.json b/browser/components/webextensions/schemas/context_menus_internal.json
index c3cb7aff0..c3cb7aff0 100644
--- a/browser/components/extensions/schemas/context_menus_internal.json
+++ b/browser/components/webextensions/schemas/context_menus_internal.json
diff --git a/browser/components/extensions/schemas/history.json b/browser/components/webextensions/schemas/history.json
index e05569e38..e05569e38 100644
--- a/browser/components/extensions/schemas/history.json
+++ b/browser/components/webextensions/schemas/history.json
diff --git a/browser/components/extensions/schemas/jar.mn b/browser/components/webextensions/schemas/jar.mn
index c9fc9a808..c9fc9a808 100644
--- a/browser/components/extensions/schemas/jar.mn
+++ b/browser/components/webextensions/schemas/jar.mn
diff --git a/browser/components/extensions/schemas/moz.build b/browser/components/webextensions/schemas/moz.build
index aac3a838c..aac3a838c 100644
--- a/browser/components/extensions/schemas/moz.build
+++ b/browser/components/webextensions/schemas/moz.build
diff --git a/browser/components/extensions/schemas/omnibox.json b/browser/components/webextensions/schemas/omnibox.json
index 34428fab7..34428fab7 100644
--- a/browser/components/extensions/schemas/omnibox.json
+++ b/browser/components/webextensions/schemas/omnibox.json
diff --git a/browser/components/extensions/schemas/page_action.json b/browser/components/webextensions/schemas/page_action.json
index 126378ca5..126378ca5 100644
--- a/browser/components/extensions/schemas/page_action.json
+++ b/browser/components/webextensions/schemas/page_action.json
diff --git a/browser/components/extensions/schemas/sessions.json b/browser/components/webextensions/schemas/sessions.json
index 690bb8ebc..690bb8ebc 100644
--- a/browser/components/extensions/schemas/sessions.json
+++ b/browser/components/webextensions/schemas/sessions.json
diff --git a/browser/components/extensions/schemas/tabs.json b/browser/components/webextensions/schemas/tabs.json
index 23ce33a4b..23ce33a4b 100644
--- a/browser/components/extensions/schemas/tabs.json
+++ b/browser/components/webextensions/schemas/tabs.json
diff --git a/browser/components/extensions/schemas/windows.json b/browser/components/webextensions/schemas/windows.json
index 8453358b5..8453358b5 100644
--- a/browser/components/extensions/schemas/windows.json
+++ b/browser/components/webextensions/schemas/windows.json
diff --git a/browser/configure.in b/browser/configure.in
index fe3e5acf1..9638c1e4d 100644
--- a/browser/configure.in
+++ b/browser/configure.in
@@ -13,3 +13,16 @@ AC_SUBST(MC_BASILISK)
 
 dnl Optional parts of the build.
 
+dnl ========================================================
+dnl = Disable WebExtensions
+dnl ========================================================
+MOZ_ARG_DISABLE_BOOL(webextensions,
+[  --disable-webextensions            Disable WebExtensions],
+    MOZ_WEBEXTENSIONS=,
+    MOZ_WEBEXTENSIONS=1)
+
+if test -n "$MOZ_WEBEXTENSIONS"; then
+    AC_DEFINE(MOZ_WEBEXTENSIONS)
+fi
+
+AC_SUBST(MOZ_WEBEXTENSIONS)
\ No newline at end of file
diff --git a/browser/confvars.sh b/browser/confvars.sh
index 25692b188..d4c2c008d 100755
--- a/browser/confvars.sh
+++ b/browser/confvars.sh
@@ -47,12 +47,15 @@ MOZ_APP_ID={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
 ACCEPTED_MAR_CHANNEL_IDS=basilisk-release
 # The MAR_CHANNEL_ID must not contain the following 3 characters: ",\t "
 MAR_CHANNEL_ID=basilisk-release
+
+# Features
 MOZ_PROFILE_MIGRATOR=1
 MOZ_APP_STATIC_INI=1
 MOZ_WEBGL_CONFORMANT=1
 MOZ_JSDOWNLOADS=1
 MOZ_RUST_MP4PARSE=1
 MOZ_RUST_URLPARSE=1
+MOZ_WEBEXTENSIONS=1
 
 # Disable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=0
diff --git a/browser/experiments/test/xpcshell/xpcshell.ini b/browser/experiments/test/xpcshell/xpcshell.ini
index 5ea30976c..5921c9c47 100644
--- a/browser/experiments/test/xpcshell/xpcshell.ini
+++ b/browser/experiments/test/xpcshell/xpcshell.ini
@@ -10,7 +10,7 @@ support-files =
   experiment-1a.xpi
   experiment-2.xpi
   experiment-racybranch.xpi
-  !/toolkit/mozapps/extensions/test/xpcshell/head_addons.js
+  !/toolkit/mozapps/webextensions/test/xpcshell/head_addons.js
 generated-files =
   experiment-1.xpi
   experiment-1a.xpi