Merge branch 'ext-work'

30 files changed, 37 insertions, 31 deletions

diff --git a/toolkit/themes/osx/mozapps/jar.mn b/toolkit/themes/osx/mozapps/jar.mn
index 3f5717073..8da83da16 100644
--- a/toolkit/themes/osx/mozapps/jar.mn
+++ b/toolkit/themes/osx/mozapps/jar.mn
@@ -8,34 +8,36 @@ toolkit.jar:
   skin/classic/mozapps/downloads/downloadIcon.png                 (downloads/downloadIcon.png)
 * skin/classic/mozapps/downloads/downloads.css                    (downloads/downloads.css)
   skin/classic/mozapps/downloads/unknownContentType.css           (downloads/unknownContentType.css)
-  skin/classic/mozapps/extensions/category-search.png             (extensions/category-search.png)
-  skin/classic/mozapps/extensions/category-discover.png           (extensions/category-discover.png)
-  skin/classic/mozapps/extensions/category-plugins.png            (extensions/category-plugins.png)
-  skin/classic/mozapps/extensions/category-service.png            (extensions/category-service.png)
-  skin/classic/mozapps/extensions/category-dictionaries.png       (extensions/category-dictionaries.png)
-  skin/classic/mozapps/extensions/category-experiments.png        (extensions/category-experiments.png)
-  skin/classic/mozapps/extensions/category-recent.png             (extensions/category-recent.png)
-  skin/classic/mozapps/extensions/category-available.png          (extensions/category-available.png)
-  skin/classic/mozapps/extensions/discover-logo.png               (extensions/discover-logo.png)
-  skin/classic/mozapps/extensions/extensionGeneric-16.png         (extensions/extensionGeneric-16.png)
-  skin/classic/mozapps/extensions/themeGeneric.png                (extensions/themeGeneric.png)
-  skin/classic/mozapps/extensions/themeGeneric-16.png             (extensions/themeGeneric-16.png)
-  skin/classic/mozapps/extensions/dictionaryGeneric.png           (extensions/dictionaryGeneric.png)
-  skin/classic/mozapps/extensions/dictionaryGeneric-16.png        (extensions/dictionaryGeneric-16.png)
-  skin/classic/mozapps/extensions/experimentGeneric.png           (extensions/experimentGeneric.png)
-  skin/classic/mozapps/extensions/localeGeneric.png               (extensions/localeGeneric.png)
-  skin/classic/mozapps/extensions/rating-won.png                  (extensions/rating-won.png)
-  skin/classic/mozapps/extensions/rating-not-won.png              (extensions/rating-not-won.png)
-  skin/classic/mozapps/extensions/cancel.png                      (extensions/cancel.png)
-  skin/classic/mozapps/extensions/toolbarbutton-dropmarker.png    (extensions/toolbarbutton-dropmarker.png)
-  skin/classic/mozapps/extensions/heart.png                       (extensions/heart.png)
-  skin/classic/mozapps/extensions/search.png                      (extensions/search.png)
-  skin/classic/mozapps/extensions/about.css                       (extensions/about.css)
-* skin/classic/mozapps/extensions/extensions.css                  (extensions/extensions.css)
-  skin/classic/mozapps/extensions/update.css                      (extensions/update.css)
-  skin/classic/mozapps/extensions/eula.css                        (extensions/eula.css)
-  skin/classic/mozapps/extensions/blocklist.css                   (extensions/blocklist.css)
-* skin/classic/mozapps/extensions/newaddon.css                    (extensions/newaddon.css)
+#ifdef MOZ_WEBEXTENSIONS
+  skin/classic/mozapps/extensions/category-search.png             (webextensions/category-search.png)
+  skin/classic/mozapps/extensions/category-discover.png           (webextensions/category-discover.png)
+  skin/classic/mozapps/extensions/category-plugins.png            (webextensions/category-plugins.png)
+  skin/classic/mozapps/extensions/category-service.png            (webextensions/category-service.png)
+  skin/classic/mozapps/extensions/category-dictionaries.png       (webextensions/category-dictionaries.png)
+  skin/classic/mozapps/extensions/category-experiments.png        (webextensions/category-experiments.png)
+  skin/classic/mozapps/extensions/category-recent.png             (webextensions/category-recent.png)
+  skin/classic/mozapps/extensions/category-available.png          (webextensions/category-available.png)
+  skin/classic/mozapps/extensions/discover-logo.png               (webextensions/discover-logo.png)
+  skin/classic/mozapps/extensions/extensionGeneric-16.png         (webextensions/extensionGeneric-16.png)
+  skin/classic/mozapps/extensions/themeGeneric.png                (webextensions/themeGeneric.png)
+  skin/classic/mozapps/extensions/themeGeneric-16.png             (webextensions/themeGeneric-16.png)
+  skin/classic/mozapps/extensions/dictionaryGeneric.png           (webextensions/dictionaryGeneric.png)
+  skin/classic/mozapps/extensions/dictionaryGeneric-16.png        (webextensions/dictionaryGeneric-16.png)
+  skin/classic/mozapps/extensions/experimentGeneric.png           (webextensions/experimentGeneric.png)
+  skin/classic/mozapps/extensions/localeGeneric.png               (webextensions/localeGeneric.png)
+  skin/classic/mozapps/extensions/rating-won.png                  (webextensions/rating-won.png)
+  skin/classic/mozapps/extensions/rating-not-won.png              (webextensions/rating-not-won.png)
+  skin/classic/mozapps/extensions/cancel.png                      (webextensions/cancel.png)
+  skin/classic/mozapps/extensions/toolbarbutton-dropmarker.png    (webextensions/toolbarbutton-dropmarker.png)
+  skin/classic/mozapps/extensions/heart.png                       (webextensions/heart.png)
+  skin/classic/mozapps/extensions/search.png                      (webextensions/search.png)
+  skin/classic/mozapps/extensions/about.css                       (webextensions/about.css)
+* skin/classic/mozapps/extensions/extensions.css                  (webextensions/extensions.css)
+  skin/classic/mozapps/extensions/update.css                      (webextensions/update.css)
+  skin/classic/mozapps/extensions/eula.css                        (webextensions/eula.css)
+  skin/classic/mozapps/extensions/blocklist.css                   (webextensions/blocklist.css)
+* skin/classic/mozapps/extensions/newaddon.css                    (webextensions/newaddon.css)
+#endif
   skin/classic/mozapps/plugins/notifyPluginGeneric.png            (plugins/notifyPluginGeneric.png)
   skin/classic/mozapps/plugins/pluginGeneric.png                  (plugins/pluginGeneric.png)
   skin/classic/mozapps/plugins/pluginBlocked.png                  (plugins/pluginBlocked.png)
@@ -48,7 +50,9 @@ toolkit.jar:
   skin/classic/mozapps/update/buttons.png                         (update/buttons.png)
 * skin/classic/mozapps/update/updates.css                         (update/updates.css)
   skin/classic/mozapps/viewsource/viewsource.css                  (viewsource/viewsource.css)
-  skin/classic/mozapps/xpinstall/xpinstallConfirm.css             (extensions/xpinstallConfirm.css)
+#ifdef MOZ_WEBEXTENSIONS
+  skin/classic/mozapps/xpinstall/xpinstallConfirm.css             (webextensions/xpinstallConfirm.css)
+#endif
   skin/classic/mozapps/handling/handling.css                      (handling/handling.css)
 
 #ifdef MOZ_PHOENIX
@@ -56,7 +60,9 @@ toolkit.jar:
 #elif MOZ_SEPARATE_MANIFEST_FOR_THEME_OVERRIDES
 [extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar:
 #endif
+#ifdef MOZ_WEBEXTENSIONS
 % override chrome://mozapps/skin/extensions/category-extensions.svg       chrome://mozapps/skin/extensions/extensionGeneric.svg
 % override chrome://mozapps/skin/extensions/category-languages.png        chrome://mozapps/skin/extensions/localeGeneric.png
 % override chrome://mozapps/skin/extensions/category-themes.png           chrome://mozapps/skin/extensions/themeGeneric.png
+#endif
 % override chrome://mozapps/skin/plugins/notifyPluginCrashed.png          chrome://mozapps/skin/plugins/notifyPluginGeneric.png
diff --git a/toolkit/themes/osx/mozapps/extensions/about.css b/toolkit/themes/osx/mozapps/webextensions/about.css
index c13ce5f59..c13ce5f59 100644
--- a/toolkit/themes/osx/mozapps/extensions/about.css
+++ b/toolkit/themes/osx/mozapps/webextensions/about.css
diff --git a/toolkit/themes/osx/mozapps/extensions/blocklist.css b/toolkit/themes/osx/mozapps/webextensions/blocklist.css
index 02f6e1d49..02f6e1d49 100644
--- a/toolkit/themes/osx/mozapps/extensions/blocklist.css
+++ b/toolkit/themes/osx/mozapps/webextensions/blocklist.css
diff --git a/toolkit/themes/osx/mozapps/extensions/cancel.png b/toolkit/themes/osx/mozapps/webextensions/cancel.png
index 0d98ab235..0d98ab235 100644
--- a/toolkit/themes/osx/mozapps/extensions/cancel.png
+++ b/toolkit/themes/osx/mozapps/webextensions/cancel.png
diff --git a/toolkit/themes/osx/mozapps/extensions/category-available.png b/toolkit/themes/osx/mozapps/webextensions/category-available.png
index d1b737ab0..d1b737ab0 100644
--- a/toolkit/themes/osx/mozapps/extensions/category-available.png
+++ b/toolkit/themes/osx/mozapps/webextensions/category-available.png
diff --git a/toolkit/themes/osx/mozapps/extensions/category-dictionaries.png b/toolkit/themes/osx/mozapps/webextensions/category-dictionaries.png
index 54ae4f93f..54ae4f93f 100644
--- a/toolkit/themes/osx/mozapps/extensions/category-dictionaries.png
+++ b/toolkit/themes/osx/mozapps/webextensions/category-dictionaries.png
diff --git a/toolkit/themes/osx/mozapps/extensions/category-discover.png b/toolkit/themes/osx/mozapps/webextensions/category-discover.png
index a6f5b49b3..a6f5b49b3 100644
--- a/toolkit/themes/osx/mozapps/extensions/category-discover.png
+++ b/toolkit/themes/osx/mozapps/webextensions/category-discover.png
diff --git a/toolkit/themes/osx/mozapps/extensions/category-experiments.png b/toolkit/themes/osx/mozapps/webextensions/category-experiments.png
index a9d00545e..a9d00545e 100644
--- a/toolkit/themes/osx/mozapps/extensions/category-experiments.png
+++ b/toolkit/themes/osx/mozapps/webextensions/category-experiments.png
diff --git a/toolkit/themes/osx/mozapps/extensions/category-plugins.png b/toolkit/themes/osx/mozapps/webextensions/category-plugins.png
index 5c4d8bf47..5c4d8bf47 100644
--- a/toolkit/themes/osx/mozapps/extensions/category-plugins.png
+++ b/toolkit/themes/osx/mozapps/webextensions/category-plugins.png
diff --git a/toolkit/themes/osx/mozapps/extensions/category-recent.png b/toolkit/themes/osx/mozapps/webextensions/category-recent.png
index 7ecfc7d4c..7ecfc7d4c 100644
--- a/toolkit/themes/osx/mozapps/extensions/category-recent.png
+++ b/toolkit/themes/osx/mozapps/webextensions/category-recent.png
diff --git a/toolkit/themes/osx/mozapps/extensions/category-search.png b/toolkit/themes/osx/mozapps/webextensions/category-search.png
index 52e91a7ce..52e91a7ce 100644
--- a/toolkit/themes/osx/mozapps/extensions/category-search.png
+++ b/toolkit/themes/osx/mozapps/webextensions/category-search.png
diff --git a/toolkit/themes/osx/mozapps/extensions/category-service.png b/toolkit/themes/osx/mozapps/webextensions/category-service.png
index 997c8541c..997c8541c 100644
--- a/toolkit/themes/osx/mozapps/extensions/category-service.png
+++ b/toolkit/themes/osx/mozapps/webextensions/category-service.png
diff --git a/toolkit/themes/osx/mozapps/extensions/dictionaryGeneric-16.png b/toolkit/themes/osx/mozapps/webextensions/dictionaryGeneric-16.png
index 4ad1a1a82..4ad1a1a82 100644
--- a/toolkit/themes/osx/mozapps/extensions/dictionaryGeneric-16.png
+++ b/toolkit/themes/osx/mozapps/webextensions/dictionaryGeneric-16.png
diff --git a/toolkit/themes/osx/mozapps/extensions/dictionaryGeneric.png b/toolkit/themes/osx/mozapps/webextensions/dictionaryGeneric.png
index 54ae4f93f..54ae4f93f 100644
--- a/toolkit/themes/osx/mozapps/extensions/dictionaryGeneric.png
+++ b/toolkit/themes/osx/mozapps/webextensions/dictionaryGeneric.png
diff --git a/toolkit/themes/osx/mozapps/extensions/discover-logo.png b/toolkit/themes/osx/mozapps/webextensions/discover-logo.png
index cd50735a8..cd50735a8 100644
--- a/toolkit/themes/osx/mozapps/extensions/discover-logo.png
+++ b/toolkit/themes/osx/mozapps/webextensions/discover-logo.png
diff --git a/toolkit/themes/osx/mozapps/extensions/eula.css b/toolkit/themes/osx/mozapps/webextensions/eula.css
index 05aeb3c1c..05aeb3c1c 100644
--- a/toolkit/themes/osx/mozapps/extensions/eula.css
+++ b/toolkit/themes/osx/mozapps/webextensions/eula.css
diff --git a/toolkit/themes/osx/mozapps/extensions/experimentGeneric.png b/toolkit/themes/osx/mozapps/webextensions/experimentGeneric.png
index a9d00545e..a9d00545e 100644
--- a/toolkit/themes/osx/mozapps/extensions/experimentGeneric.png
+++ b/toolkit/themes/osx/mozapps/webextensions/experimentGeneric.png
diff --git a/toolkit/themes/osx/mozapps/extensions/extensionGeneric-16.png b/toolkit/themes/osx/mozapps/webextensions/extensionGeneric-16.png
index fc6c8a258..fc6c8a258 100644
--- a/toolkit/themes/osx/mozapps/extensions/extensionGeneric-16.png
+++ b/toolkit/themes/osx/mozapps/webextensions/extensionGeneric-16.png
diff --git a/toolkit/themes/osx/mozapps/extensions/extensions.css b/toolkit/themes/osx/mozapps/webextensions/extensions.css
index d4dac2f01..cbdd9a5b0 100644
--- a/toolkit/themes/osx/mozapps/extensions/extensions.css
+++ b/toolkit/themes/osx/mozapps/webextensions/extensions.css
@@ -2,7 +2,7 @@
  * 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/. */
 
-%include ../../../shared/extensions/extensions.inc.css
+%include ../../../shared/webextensions/extensions.inc.css
 
 .no-auto-hide > .menulist-dropmarker {
   padding-inline-start: 0px !important;
diff --git a/toolkit/themes/osx/mozapps/extensions/heart.png b/toolkit/themes/osx/mozapps/webextensions/heart.png
index 655f4c4be..655f4c4be 100644
--- a/toolkit/themes/osx/mozapps/extensions/heart.png
+++ b/toolkit/themes/osx/mozapps/webextensions/heart.png
diff --git a/toolkit/themes/osx/mozapps/extensions/localeGeneric.png b/toolkit/themes/osx/mozapps/webextensions/localeGeneric.png
index 4d9ac5ad8..4d9ac5ad8 100644
--- a/toolkit/themes/osx/mozapps/extensions/localeGeneric.png
+++ b/toolkit/themes/osx/mozapps/webextensions/localeGeneric.png
diff --git a/toolkit/themes/osx/mozapps/extensions/newaddon.css b/toolkit/themes/osx/mozapps/webextensions/newaddon.css
index edfba0ef5..5856c08b5 100644
--- a/toolkit/themes/osx/mozapps/extensions/newaddon.css
+++ b/toolkit/themes/osx/mozapps/webextensions/newaddon.css
@@ -2,4 +2,4 @@
  * 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/. */
 
-%include ../../../shared/extensions/newaddon.inc.css
+%include ../../../shared/webextensions/newaddon.inc.css
diff --git a/toolkit/themes/osx/mozapps/extensions/rating-not-won.png b/toolkit/themes/osx/mozapps/webextensions/rating-not-won.png
index 2761f1925..2761f1925 100644
--- a/toolkit/themes/osx/mozapps/extensions/rating-not-won.png
+++ b/toolkit/themes/osx/mozapps/webextensions/rating-not-won.png
diff --git a/toolkit/themes/osx/mozapps/extensions/rating-won.png b/toolkit/themes/osx/mozapps/webextensions/rating-won.png
index 336dd8f6e..336dd8f6e 100644
--- a/toolkit/themes/osx/mozapps/extensions/rating-won.png
+++ b/toolkit/themes/osx/mozapps/webextensions/rating-won.png
diff --git a/toolkit/themes/osx/mozapps/extensions/search.png b/toolkit/themes/osx/mozapps/webextensions/search.png
index 93196dbbf..93196dbbf 100644
--- a/toolkit/themes/osx/mozapps/extensions/search.png
+++ b/toolkit/themes/osx/mozapps/webextensions/search.png
diff --git a/toolkit/themes/osx/mozapps/extensions/themeGeneric-16.png b/toolkit/themes/osx/mozapps/webextensions/themeGeneric-16.png
index 190bb30d7..190bb30d7 100644
--- a/toolkit/themes/osx/mozapps/extensions/themeGeneric-16.png
+++ b/toolkit/themes/osx/mozapps/webextensions/themeGeneric-16.png
diff --git a/toolkit/themes/osx/mozapps/extensions/themeGeneric.png b/toolkit/themes/osx/mozapps/webextensions/themeGeneric.png
index be645f76d..be645f76d 100644
--- a/toolkit/themes/osx/mozapps/extensions/themeGeneric.png
+++ b/toolkit/themes/osx/mozapps/webextensions/themeGeneric.png
diff --git a/toolkit/themes/osx/mozapps/extensions/toolbarbutton-dropmarker.png b/toolkit/themes/osx/mozapps/webextensions/toolbarbutton-dropmarker.png
index e7674c62a..e7674c62a 100644
--- a/toolkit/themes/osx/mozapps/extensions/toolbarbutton-dropmarker.png
+++ b/toolkit/themes/osx/mozapps/webextensions/toolbarbutton-dropmarker.png
diff --git a/toolkit/themes/osx/mozapps/extensions/update.css b/toolkit/themes/osx/mozapps/webextensions/update.css
index a0a016868..a0a016868 100644
--- a/toolkit/themes/osx/mozapps/extensions/update.css
+++ b/toolkit/themes/osx/mozapps/webextensions/update.css
diff --git a/toolkit/themes/osx/mozapps/extensions/xpinstallConfirm.css b/toolkit/themes/osx/mozapps/webextensions/xpinstallConfirm.css
index 48af7c1a9..48af7c1a9 100644
--- a/toolkit/themes/osx/mozapps/extensions/xpinstallConfirm.css
+++ b/toolkit/themes/osx/mozapps/webextensions/xpinstallConfirm.css