[WFX-347] Remove redundant extensibles code.

To be squashed with [WFX-171].
mqt635 · Mar 7, 2022 · 673fca2 · 673fca2
1 parent 3b9d71a
commit 673fca2
Show file tree

Hide file tree

Showing 21 changed files with 11 additions and 1,412 deletions.
diff --git 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
       <toolbarseparator/>
-#include ../../extensions/extensibles/extension/builtins/appmenu/restartbutton.inc
+#include ../../extensions/extensibles/builtins/appmenu/restartbutton.inc
       <toolbarbutton id="appMenu-quit-button2"
                      class="subviewbutton"
                      data-l10n-id="appmenuitem-exit2"

diff --git a/browser/base/content/browser-menubar.inc b/browser/base/content/browser-menubar.inc
@@ -80,7 +80,7 @@
                           type="checkbox"
                           command="cmd_toggleOfflineStatus" data-l10n-id="menu-file-go-offline"/>
 #ifdef XP_MACOSX
-  #include ../../extensions/extensibles/extension/builtins/menubar/restartbutton.inc
+  #include ../../extensions/extensibles/builtins/menubar/restartbutton.inc
 #endif
                 <menuitem id="menu_FileQuitItem"
 #ifdef XP_MACOSX

diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css
@@ -1644,4 +1644,4 @@ toolbar[keyNav=true]:not([collapsed=true], [customizing=true]) toolbartabstop {
  * End Dialogs
  */
 
-%include ../../extensions/extensibles/extension/css/tabfeatures.inc.css
+%include ../../extensions/extensibles/css/tabfeatures.inc.css
diff --git a/browser/base/content/main-popupset.inc.xhtml b/browser/base/content/main-popupset.inc.xhtml
@@ -28,7 +28,7 @@
               oncommand="duplicateTabIn(TabContextMenu.contextTab, 'tab');"/>
     <menuitem id="context_duplicateTabs" data-lazy-l10n-id="duplicate-tabs"
               oncommand="TabContextMenu.duplicateSelectedTabs();"/>
-#include ../../extensions/extensibles/extension/builtins/context/copyurl.inc
+#include ../../extensions/extensibles/builtins/context/copyurl.inc
     <menuseparator/>
     <menuitem id="context_bookmarkSelectedTabs"
               hidden="true"

diff --git a/browser/base/content/tabbrowser.js b/browser/base/content/tabbrowser.js
@@ -7293,12 +7293,4 @@ var TabContextMenu = {
       sharingService.openSharingPreferences();
     }
   },
-
-  copyTabUrl(uri) {
-    Services.obs.notifyObservers(null, "menuitem-copyurl-extension", uri);
-  },
-
-  copyAllTabUrls() {
-    Services.obs.notifyObservers(null, "menuitem-copyallurls-extension");
-  },
 };
diff --git a/browser/components/preferences/main.inc.xhtml b/browser/components/preferences/main.inc.xhtml
@@ -117,7 +117,7 @@
       </hbox>
     </vbox>
 
-#include ../../extensions/extensibles/extension/builtins/preferences/tabfeatures.inc
+#include ../../extensions/extensibles/builtins/preferences/tabfeatures.inc
 
 </groupbox>
 <hbox id="languageAndAppearanceCategory"
@@ -337,7 +337,7 @@
           preference="layout.spellcheckDefault"/>
 </groupbox>
 
-#include ../../extensions/extensibles/extension/builtins/preferences/otherfeatures.inc
+#include ../../extensions/extensibles/builtins/preferences/otherfeatures.inc
 
 <!-- Files and Applications -->
 <hbox id="filesAndApplicationsCategory"

diff --git a/browser/components/preferences/privacy.inc.xhtml b/browser/components/preferences/privacy.inc.xhtml
@@ -320,7 +320,7 @@
   </vbox>
 </groupbox>
 
-#include ../../extensions/extensibles/extension/builtins/preferences/privacyconnections.inc
+#include ../../extensions/extensibles/builtins/preferences/privacyconnections.inc
 
 <!-- Site Data -->
 <groupbox id="siteDataGroup" data-category="panePrivacy" hidden="true" aria-describedby="totalSiteDataSize">
@@ -825,7 +825,7 @@
     </hbox>
   </hbox>
 
-#include ../../extensions/extensibles/extension/builtins/preferences/privacypermissions.inc
+#include ../../extensions/extensibles/builtins/preferences/privacypermissions.inc
 
 </groupbox>
 

diff --git a/...ension/builtins/appmenu/restartbutton.inc → ...sibles/builtins/appmenu/restartbutton.inc b/...ension/builtins/appmenu/restartbutton.inc → ...sibles/builtins/appmenu/restartbutton.inc
diff --git a/...es/extension/builtins/context/copyurl.inc → .../extensibles/builtins/context/copyurl.inc b/...es/extension/builtins/context/copyurl.inc → .../extensibles/builtins/context/copyurl.inc
@@ -1,14 +1,14 @@
 <menuitem
     id="context_copyTabUrl"
     class="tabFeature"
-    oncommand="TabContextMenu.copyTabUrl(TabContextMenu.contextTab.linkedBrowser.currentURI.spec);"
+    oncommand="TabFeatures.copyTabUrl(TabContextMenu.contextTab.linkedBrowser.currentURI.spec, window);"
     data-lazy-l10n-id="copy-url"
     preference="browser.tabs.copyurl"
 />
 <menuitem
     id="context_copyAllTabUrls"
     class="tabFeature"
-    oncommand="TabContextMenu.copyAllTabUrls();"
+    oncommand="TabFeatures.copyAllTabUrls(window);"
     data-lazy-l10n-id="copy-all-urls"
     preference="browser.tabs.copyallurls"
 />
diff --git a/...ension/builtins/menubar/restartbutton.inc → ...sibles/builtins/menubar/restartbutton.inc b/...ension/builtins/menubar/restartbutton.inc → ...sibles/builtins/menubar/restartbutton.inc
diff --git a/...on/builtins/preferences/otherfeatures.inc → ...es/builtins/preferences/otherfeatures.inc b/...on/builtins/preferences/otherfeatures.inc → ...es/builtins/preferences/otherfeatures.inc
diff --git a/...iltins/preferences/privacyconnections.inc → ...iltins/preferences/privacyconnections.inc b/...iltins/preferences/privacyconnections.inc → ...iltins/preferences/privacyconnections.inc
diff --git a/...iltins/preferences/privacypermissions.inc → ...iltins/preferences/privacypermissions.inc b/...iltins/preferences/privacypermissions.inc → ...iltins/preferences/privacypermissions.inc
diff --git a/...sion/builtins/preferences/tabfeatures.inc → ...bles/builtins/preferences/tabfeatures.inc b/...sion/builtins/preferences/tabfeatures.inc → ...bles/builtins/preferences/tabfeatures.inc
diff --git a/...nsibles/extension/css/tabfeatures.inc.css → ...sions/extensibles/css/tabfeatures.inc.css b/...nsibles/extension/css/tabfeatures.inc.css → ...sions/extensibles/css/tabfeatures.inc.css