diff options
author | Jeroen Vreeken <jeroen@vreeken.net> | 2019-07-18 11:02:12 +0200 |
---|---|---|
committer | Jeroen Vreeken <jeroen@vreeken.net> | 2019-07-18 11:02:12 +0200 |
commit | f820636a8300b44751750354a01be21895b4b536 (patch) | |
tree | ab217ad50a145a8c7a1094fbafd5d3d30260e7cd /application/basilisk | |
parent | 6b6aa59ffc97ac76b4429db38eedac8474f5fda7 (diff) | |
parent | 45cb5ab7291f44d3e06de4e71e5b0a9e80f6a0b6 (diff) | |
download | UXP-f820636a8300b44751750354a01be21895b4b536.tar UXP-f820636a8300b44751750354a01be21895b4b536.tar.gz UXP-f820636a8300b44751750354a01be21895b4b536.tar.lz UXP-f820636a8300b44751750354a01be21895b4b536.tar.xz UXP-f820636a8300b44751750354a01be21895b4b536.zip |
Merge branch 'master' of github.com:JeroenVreeken/UXP
Diffstat (limited to 'application/basilisk')
-rw-r--r-- | application/basilisk/components/customizableui/CustomizableUI.jsm | 5 | ||||
-rw-r--r-- | application/basilisk/installer/package-manifest.in | 7 |
2 files changed, 0 insertions, 12 deletions
diff --git a/application/basilisk/components/customizableui/CustomizableUI.jsm b/application/basilisk/components/customizableui/CustomizableUI.jsm index d56d63d99..a58d33a6d 100644 --- a/application/basilisk/components/customizableui/CustomizableUI.jsm +++ b/application/basilisk/components/customizableui/CustomizableUI.jsm @@ -38,7 +38,6 @@ const kPrefCustomizationState = "browser.uiCustomization.state"; const kPrefCustomizationAutoAdd = "browser.uiCustomization.autoAdd"; const kPrefCustomizationDebug = "browser.uiCustomization.debug"; const kPrefDrawInTitlebar = "browser.tabs.drawInTitlebar"; -const kPrefWebIDEInNavbar = "devtools.webide.widget.inNavbarByDefault"; const kExpectedWindowURL = "chrome://browser/content/browser.xul"; @@ -230,10 +229,6 @@ var CustomizableUIInternal = { navbarPlacements.splice(2, 0, "developer-button"); } - if (Services.prefs.getBoolPref(kPrefWebIDEInNavbar)) { - navbarPlacements.push("webide-button"); - } - // Place this last, when createWidget is called for pocket, it will // append to the toolbar. if (Services.prefs.getPrefType("extensions.pocket.enabled") != Services.prefs.PREF_INVALID && diff --git a/application/basilisk/installer/package-manifest.in b/application/basilisk/installer/package-manifest.in index 71f775904..f9ca0d727 100644 --- a/application/basilisk/installer/package-manifest.in +++ b/application/basilisk/installer/package-manifest.in @@ -354,8 +354,6 @@ @RESPATH@/browser/components/nsSetDefaultBrowser.js @RESPATH@/browser/components/devtools-startup.manifest @RESPATH@/browser/components/devtools-startup.js -@RESPATH@/browser/components/webideCli.js -@RESPATH@/browser/components/webideComponents.manifest @RESPATH@/browser/components/browser-newtab.xpt @RESPATH@/browser/components/aboutNewTabService.js @RESPATH@/browser/components/NewTabComponents.manifest @@ -595,11 +593,6 @@ @RESPATH@/browser/chrome/icons/default/default48.png #endif -; [Webide Files] -@RESPATH@/browser/chrome/webide@JAREXT@ -@RESPATH@/browser/chrome/webide.manifest -@RESPATH@/browser/@PREF_DIR@/webide-prefs.js - ; DevTools @RESPATH@/browser/chrome/devtools@JAREXT@ @RESPATH@/browser/chrome/devtools.manifest |