Commit 6c3d159a authored by Alex Catarineu's avatar Alex Catarineu Committed by Georg Koppen
Browse files

Bug 33890: Rename xul files to xhtml

Also remove a customizeToolbar.xul line from chrome.manifest,
since it's not needed.
parent 89db1e89
......@@ -132,7 +132,6 @@ locale torbutton zh-TW chrome/locale/zh-TW/
locale torbutton zu chrome/locale/zu/
skin torbutton classic/1.0 chrome/skin/
style chrome://global/content/customizeToolbar.xul chrome://torbutton/skin/torbutton.css
# Firefox 4-style component registration
component {f605ec27-d867-44b5-ad97-2a29276642c3} components/dragDropFilter.js
......
......@@ -5,7 +5,7 @@
// call earlier functions). The file can be processed
// with docco.js to produce pretty documentation.
//
// This script is to be embedded in torbutton.xul. It defines a single global
// This script is to be embedded in torbutton.xhtml. It defines a single global
// function, createTorCircuitDisplay(), which activates the automatic Tor
// circuit display for the current tab and any future tabs.
//
......
......@@ -73,7 +73,7 @@ ExternalAppBlocker.prototype =
/*
* The _showPrompt() implementation uses some XUL and JS that is part of the
* browser's confirmEx() implementation. Specifically, _showPrompt() depends
* on chrome://global/content/commonDialog.xul as well as some of the code
* on chrome://global/content/commonDialog.xhtml as well as some of the code
* in resource://gre/modules/SharedPromptUtils.jsm.
*/
_showPrompt: function(aWindowContext) {
......@@ -107,7 +107,7 @@ ExternalAppBlocker.prototype =
};
let propBag = PromptUtils.objectToPropBag(args);
let uri = "chrome://global/content/commonDialog.xul";
let uri = "chrome://global/content/commonDialog.xhtml";
let promptWin = Services.ww.openWindow(parentWin, uri, "_blank",
"centerscreen,chrome,titlebar", propBag);
promptWin.addEventListener("load", aEvent => {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment