From b0210f373ffbd85c8b5b6f50c477470f5f2fbce7 Mon Sep 17 00:00:00 2001
From: adamp01 <47503375+adamp01@users.noreply.github.com>
Date: Wed, 2 Mar 2022 10:06:14 +0000
Subject: [PATCH] [WFX-347] Remove redundant extensibles code.
To be squashed with [WFX-171].
---
.../base/content/appmenu-viewcache.inc.xhtml | 2 +-
browser/base/content/browser-menubar.inc | 2 +-
browser/base/content/browser.css | 2 +-
browser/base/content/main-popupset.inc.xhtml | 2 +-
browser/base/content/tabbrowser.js | 8 -
browser/components/preferences/main.inc.xhtml | 4 +-
.../components/preferences/privacy.inc.xhtml | 4 +-
.../builtins/appmenu/restartbutton.inc | 0
.../builtins/context/copyurl.inc | 4 +-
.../builtins/menubar/restartbutton.inc | 0
.../builtins/preferences/otherfeatures.inc | 0
.../preferences/privacyconnections.inc | 0
.../preferences/privacypermissions.inc | 0
.../builtins/preferences/tabfeatures.inc | 0
.../{extension => }/css/tabfeatures.inc.css | 0
.../experiment-apis/extensibles/api.js | 378 ------------
.../experiment-apis/extensibles/schema.json | 544 ------------------
.../extensibles/extension/manifest.json | 21 +-
.../extension/privatetab/background.js | 344 -----------
.../extension/statusbar/background.js | 99 ----
.../extension/tabfeatures/background.js | 9 -
21 files changed, 11 insertions(+), 1412 deletions(-)
rename browser/extensions/extensibles/{extension => }/builtins/appmenu/restartbutton.inc (100%)
rename browser/extensions/extensibles/{extension => }/builtins/context/copyurl.inc (64%)
rename browser/extensions/extensibles/{extension => }/builtins/menubar/restartbutton.inc (100%)
rename browser/extensions/extensibles/{extension => }/builtins/preferences/otherfeatures.inc (100%)
rename browser/extensions/extensibles/{extension => }/builtins/preferences/privacyconnections.inc (100%)
rename browser/extensions/extensibles/{extension => }/builtins/preferences/privacypermissions.inc (100%)
rename browser/extensions/extensibles/{extension => }/builtins/preferences/tabfeatures.inc (100%)
rename browser/extensions/extensibles/{extension => }/css/tabfeatures.inc.css (100%)
delete mode 100644 browser/extensions/extensibles/extension/experiment-apis/extensibles/api.js
delete mode 100644 browser/extensions/extensibles/extension/experiment-apis/extensibles/schema.json
delete mode 100644 browser/extensions/extensibles/extension/privatetab/background.js
delete mode 100644 browser/extensions/extensibles/extension/statusbar/background.js
delete mode 100644 browser/extensions/extensibles/extension/tabfeatures/background.js
diff --git a/browser/base/content/appmenu-viewcache.inc.xhtml b/browser/base/content/appmenu-viewcache.inc.xhtml
index fd39a04c0eafb..c0aad0071a44e 100644
--- a/browser/base/content/appmenu-viewcache.inc.xhtml
+++ b/browser/base/content/appmenu-viewcache.inc.xhtml
@@ -348,7 +348,7 @@
oncommand="PanelUI.showSubView('PanelUI-helpView', this)"/>
#ifndef XP_MACOSX
-#include ../../extensions/extensibles/extension/builtins/appmenu/restartbutton.inc
+#include ../../extensions/extensibles/builtins/appmenu/restartbutton.inc
#ifdef XP_MACOSX
- #include ../../extensions/extensibles/extension/builtins/menubar/restartbutton.inc
+ #include ../../extensions/extensibles/builtins/menubar/restartbutton.inc
#endif
-#include ../../extensions/extensibles/extension/builtins/context/copyurl.inc
+#include ../../extensions/extensibles/builtins/context/copyurl.inc