corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1601093, Rename the remaining .xul files to .xhtml in toolkit/ r=marionette-reviewers,mossop,whimboo

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D55857
This commit is contained in:
Emma Malysz
2019-12-11 17:02:20 +00:00
parent 4bb4352828
commit abfeb3aaa3
76 changed files with 79 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
browser/actors/PromptParent.jsm
View File

@@ -134,8 +134,8 @@ class PromptParent extends JSWindowActorParent {
switch (message.name) {
case "Prompt:Open": {
const COMMON_DIALOG = "chrome://global/content/commonDialog.xul";
const SELECT_DIALOG = "chrome://global/content/selectDialog.xul";
const COMMON_DIALOG = "chrome://global/content/commonDialog.xhtml";
const SELECT_DIALOG = "chrome://global/content/selectDialog.xhtml";
let topPrincipal =
browsingContext.top.currentWindowGlobal.documentPrincipal;

2
browser/base/content/safeMode.js
View File

@@ -31,7 +31,7 @@ function showResetDialog() {
reset: false,
};
window.openDialog(
"chrome://global/content/resetProfile.xul",
"chrome://global/content/resetProfile.xhtml",
null,
"chrome,modal,centerscreen,titlebar,dialog=yes",
retVals

2
browser/components/downloads/DownloadsCommon.jsm
View File

@@ -632,7 +632,7 @@ var DownloadsCommon = {
function() {
if (
subj.document.documentURI ==
"chrome://global/content/commonDialog.xul"
"chrome://global/content/commonDialog.xhtml"
) {
Services.ww.unregisterNotification(onOpen);
let dialog = subj.document.getElementById("commonDialog");

2
browser/components/downloads/content/contentAreaDownloadsView.xhtml
View File

@@ -32,7 +32,7 @@
<script src="chrome://global/content/contentAreaUtils.js"/>
<script src="chrome://global/content/editMenuOverlay.js"/>
#include ../../../../toolkit/content/editMenuKeys.inc.xul
#include ../../../../toolkit/content/editMenuKeys.inc.xhtml
#ifdef XP_MACOSX
<keyset id="editMenuKeysExtra">
<key id="key_delete2" keycode="VK_BACK" command="cmd_delete"/>

4
browser/components/enterprisepolicies/Policies.jsm
View File

@@ -1085,7 +1085,7 @@ var Policies = {
onBeforeUIStartup(manager, param) {
if (!param) {
blockAboutPage(manager, "about:logins", true);
gBlockedChromePages.push("passwordManager.xul");
gBlockedChromePages.push("passwordManager.xhtml");
setAndLockPref("pref.privacy.disable_button.view_passwords", true);
}
setAndLockPref("signon.rememberSignons", param);
@@ -1774,7 +1774,7 @@ function blockAboutPage(manager, feature, neededOnContentProcess = false) {
gBlockedChromePages.push(fileName);
if (feature == "about:config") {
// Hide old page until it is removed
gBlockedChromePages.push("config.xul");
gBlockedChromePages.push("config.xhtml");
}
}

2
browser/components/places/content/historySidebar.xhtml
View File

@@ -34,7 +34,7 @@
#include placesCommands.inc.xhtml
#include ../../../../toolkit/content/editMenuKeys.inc.xul
#include ../../../../toolkit/content/editMenuKeys.inc.xhtml
#ifdef XP_MACOSX
<keyset id="editMenuKeysExtra">
<key id="key_delete2" keycode="VK_BACK" command="cmd_delete"/>

2
browser/components/places/content/places.xhtml
View File

@@ -135,7 +135,7 @@
#endif
</keyset>
#include ../../../../toolkit/content/editMenuKeys.inc.xul
#include ../../../../toolkit/content/editMenuKeys.inc.xhtml
#ifdef XP_MACOSX
<keyset id="editMenuKeysExtra">
<key id="key_delete2" keycode="VK_BACK" command="cmd_delete"/>

2
browser/components/preferences/in-content/main.js
View File

@@ -2584,7 +2584,7 @@ var gMainPane = {
};
gSubDialog.open(
"chrome://global/content/appPicker.xul",
"chrome://global/content/appPicker.xhtml",
null,
params,
onAppSelected

2
browser/components/preferences/in-content/privacy.js
View File

@@ -1915,7 +1915,7 @@ var gPrivacyPane = {
return;
}
Services.telemetry.recordEvent("pwmgr", "open_management", "preferences");
gSubDialog.open("chrome://passwordmgr/content/passwordManager.xul");
gSubDialog.open("chrome://passwordmgr/content/passwordManager.xhtml");
},
/**

2
browser/components/preferences/in-content/tests/browser_change_app_handler.js
View File

@@ -47,7 +47,7 @@ add_task(async function() {
let chooseItem = list.menupopup.querySelector(".choose-app-item");
let dialogLoadedPromise = promiseLoadSubDialog(
"chrome://global/content/appPicker.xul"
"chrome://global/content/appPicker.xhtml"
);
let cmdEvent = win.document.createEvent("xulcommandevent");
cmdEvent.initCommandEvent(

2
browser/components/preferences/in-content/tests/browser_password_management.js
View File

@@ -2,7 +2,7 @@
ChromeUtils.import("resource://testing-common/TelemetryTestUtils.jsm", this);
const PM_URL = "chrome://passwordmgr/content/passwordManager.xul";
const PM_URL = "chrome://passwordmgr/content/passwordManager.xhtml";
const PREF_MANAGEMENT_URI = "signon.management.overrideURI";
var passwordsDialog;

2
browser/components/search/test/browser/browser_webapi.js
View File

@@ -29,7 +29,7 @@ function promiseDialogOpened() {
let win = xulWin.docShell.domWindow;
waitForFocus(() => {
if (win.location == "chrome://global/content/commonDialog.xul") {
if (win.location == "chrome://global/content/commonDialog.xhtml") {
resolve(win);
} else {
reject();

2
browser/components/uitour/test/browser_UITour_modalDialog.js
View File

@@ -70,7 +70,7 @@ function getDialogDoc() {
// ok(true, "Got window: " + childDoc.location.href);
if (
childDoc.location.href == "chrome://global/content/commonDialog.xul"
childDoc.location.href == "chrome://global/content/commonDialog.xhtml"
) {
return childDoc;
}

2
browser/components/uitour/test/browser_UITour_resetProfile.js
View File

@@ -21,7 +21,7 @@ add_UITour_task(async function test_resetFirefox() {
function() {
if (
subj.document.documentURI ==
"chrome://global/content/resetProfile.xul"
"chrome://global/content/resetProfile.xhtml"
) {
Services.ww.unregisterNotification(onOpen);
ok(true, "Observed search manager window open");

2
browser/components/urlbar/tests/ext/browser/browser_ext_urlbar_resetBrowser.js
View File

@@ -51,7 +51,7 @@ async function checkExtension() {
function() {
if (
subj.document.documentURI ==
"chrome://global/content/resetProfile.xul"
"chrome://global/content/resetProfile.xhtml"
) {
Services.ww.unregisterNotification(onOpen);
Assert.ok(true, "Observed search manager window open");

2
docshell/base/nsAboutRedirector.cpp
View File

@@ -68,7 +68,7 @@ static const RedirEntry kRedirMap[] = {
nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
nsIAboutModule::ALLOW_SCRIPT},
#ifndef MOZ_BUILD_APP_IS_BROWSER
{"config", "chrome://global/content/config.xul", 0},
{"config", "chrome://global/content/config.xhtml", 0},
#endif
#ifdef MOZ_CRASHREPORTER
{"crashes", "chrome://global/content/crashes.xhtml", 0},

2
dom/base/test/test_fragment_sanitization.xhtml
View File

@@ -53,7 +53,7 @@ async function testFrame(frame, html, expected = html) {
}
add_task(async function test_fragment_sanitization() {
const XUL_URL = "chrome://global/content/win.xul";
const XUL_URL = "chrome://global/content/win.xhtml";
const HTML_URL = "chrome://mochitests/content/chrome/dom/base/test/file_empty.html";
const HTML = '<a onclick="foo()" href="javascript:foo"><script>bar()<\/script>Meh.</a><a href="http://foo/"></a>';

2
mobile/android/chrome/geckoview/jar.mn
View File

@@ -7,7 +7,7 @@ geckoview.jar:
content/config.xhtml
content/config.js
% override chrome://global/content/config.xul chrome://geckoview/content/config.xhtml
% override chrome://global/content/config.xhtml chrome://geckoview/content/config.xhtml
content/ErrorPageEventHandler.js
content/geckoview.xul

2
testing/marionette/modal.js
View File

@@ -15,7 +15,7 @@ XPCOMUtils.defineLazyGetter(this, "logger", Log.get);
this.EXPORTED_SYMBOLS = ["modal"];
const COMMON_DIALOG = "chrome://global/content/commonDialog.xul";
const COMMON_DIALOG = "chrome://global/content/commonDialog.xhtml";
const isFirefox = () =>
Services.appinfo.ID == "{ec8030f7-c20a-464f-9b0e-13a3a9e97384}";

4
testing/mochitest/BrowserTestUtils/BrowserTestUtils.jsm
View File

@@ -2053,7 +2053,7 @@ var BrowserTestUtils = {
*/
async promiseAlertDialogOpen(
buttonAction,
uri = "chrome://global/content/commonDialog.xul",
uri = "chrome://global/content/commonDialog.xhtml",
func
) {
let win = await this.domWindowOpened(null, async win => {
@@ -2091,7 +2091,7 @@ var BrowserTestUtils = {
*/
async promiseAlertDialog(
buttonAction,
uri = "chrome://global/content/commonDialog.xul",
uri = "chrome://global/content/commonDialog.xhtml",
func
) {
let win = await this.promiseAlertDialogOpen(buttonAction, uri, func);

2
toolkit/components/alerts/jar.mn
View File

@@ -4,5 +4,5 @@
toolkit.jar:
content/global/alerts/alert.css (resources/content/alert.css)
content/global/alerts/alert.xul (resources/content/alert.xul)
content/global/alerts/alert.xhtml (resources/content/alert.xhtml)
content/global/alerts/alert.js (resources/content/alert.js)

2
toolkit/components/alerts/nsXULAlerts.cpp
View File

@@ -18,7 +18,7 @@
using namespace mozilla;
#define ALERT_CHROME_URL "chrome://global/content/alerts/alert.xul"
#define ALERT_CHROME_URL "chrome://global/content/alerts/alert.xhtml"
namespace {
StaticRefPtr<nsXULAlerts> gXULAlerts;

0
toolkit/components/alerts/resources/content/alert.xul → toolkit/components/alerts/resources/content/alert.xhtml
View File

0
toolkit/components/apppicker/content/appPicker.xul → toolkit/components/apppicker/content/appPicker.xhtml
View File

2
toolkit/components/apppicker/jar.mn
View File

@@ -3,6 +3,6 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
toolkit.jar:
content/global/appPicker.xul (content/appPicker.xul)
content/global/appPicker.xhtml (content/appPicker.xhtml)
content/global/appPicker.js (content/appPicker.js)

2
toolkit/components/extensions/ExtensionParent.jsm
View File

@@ -1287,7 +1287,7 @@ class HiddenXULWindow {
triggeringPrincipal: system,
};
chromeShell.loadURI(
"chrome://extensions/content/dummy.xul",
"chrome://extensions/content/dummy.xhtml",
loadURIOptions
);

2
toolkit/components/extensions/ExtensionXPCShellUtils.jsm
View File

@@ -209,7 +209,7 @@ class ContentPage {
triggeringPrincipal: system,
};
chromeShell.loadURI(
"chrome://extensions/content/dummy.xul",
"chrome://extensions/content/dummy.xhtml",
loadURIOptions
);

0
toolkit/components/extensions/dummy.xul → toolkit/components/extensions/dummy.xhtml
View File

2
toolkit/components/extensions/jar.mn
View File

@@ -4,7 +4,7 @@
toolkit.jar:
% content extensions %content/extensions/
content/extensions/dummy.xul
content/extensions/dummy.xhtml
content/extensions/ext-browser-content.js
content/extensions/ext-toolkit.json
content/extensions/parent/ext-activityLog.js (parent/ext-activityLog.js)

2
toolkit/components/passwordmgr/LoginHelper.jsm
View File

@@ -818,7 +818,7 @@ this.LoginHelper = {
win.focus();
} else {
window.openDialog(
"chrome://passwordmgr/content/passwordManager.xul",
"chrome://passwordmgr/content/passwordManager.xhtml",
"Toolkit:PasswordManager",
"",
{ filterString }

0
toolkit/components/passwordmgr/content/passwordManager.xul → toolkit/components/passwordmgr/content/passwordManager.xhtml
View File

2
toolkit/components/passwordmgr/jar.mn
View File

@@ -4,6 +4,6 @@
toolkit.jar:
% content passwordmgr %content/passwordmgr/
* content/passwordmgr/passwordManager.xul (content/passwordManager.xul)
* content/passwordmgr/passwordManager.xhtml (content/passwordManager.xhtml)
content/passwordmgr/passwordManager.js (content/passwordManager.js)
content/passwordmgr/recipes.json (content/recipes.json)

2
toolkit/components/passwordmgr/test/browser/browser_basicAuth_rateLimit.js
View File

@@ -5,7 +5,7 @@
// This tests that the basic auth dialog can not be used for DOS attacks
// and that the protections are reset on user-initiated navigation/reload.
const PROMPT_URL = "chrome://global/content/commonDialog.xul";
const PROMPT_URL = "chrome://global/content/commonDialog.xhtml";
function promiseAuthWindowShown() {
return new Promise(resolve => {
let listener = {

2
toolkit/components/passwordmgr/test/browser/browser_passwordmgr_contextmenu.js
View File

@@ -37,7 +37,7 @@ add_task(async function test() {
logins.forEach(login => Services.logins.addLogin(login));
// Open the password manager dialog
const PWMGR_DLG = "chrome://passwordmgr/content/passwordManager.xul";
const PWMGR_DLG = "chrome://passwordmgr/content/passwordManager.xhtml";
let pwmgrdlg = window.openDialog(PWMGR_DLG, "Toolkit:PasswordManager", "");
SimpleTest.waitForFocus(doTest, pwmgrdlg);

2
toolkit/components/passwordmgr/test/browser/browser_passwordmgr_editing.js
View File

@@ -1,7 +1,7 @@
const { ContentTaskUtils } = ChromeUtils.import(
"resource://testing-common/ContentTaskUtils.jsm"
);
const PWMGR_DLG = "chrome://passwordmgr/content/passwordManager.xul";
const PWMGR_DLG = "chrome://passwordmgr/content/passwordManager.xhtml";
var doc;
var pwmgr;

2
toolkit/components/passwordmgr/test/browser/browser_passwordmgr_fields.js
View File

@@ -24,7 +24,7 @@ add_task(async function test() {
Services.logins.addLogin(login);
// Open the password manager dialog
const PWMGR_DLG = "chrome://passwordmgr/content/passwordManager.xul";
const PWMGR_DLG = "chrome://passwordmgr/content/passwordManager.xhtml";
let pwmgrdlg = window.openDialog(PWMGR_DLG, "Toolkit:PasswordManager", "");
SimpleTest.waitForFocus(doTest, pwmgrdlg);

2
toolkit/components/passwordmgr/test/browser/browser_passwordmgr_observers.js
View File

@@ -12,7 +12,7 @@ add_task(async function test() {
"init"
);
let pmDialog = window.openDialog(
"chrome://passwordmgr/content/passwordManager.xul",
"chrome://passwordmgr/content/passwordManager.xhtml",
"Toolkit:PasswordManager",
""
);

2
toolkit/components/passwordmgr/test/browser/browser_passwordmgr_sort.js
View File

@@ -63,7 +63,7 @@ add_task(async function test() {
}
// Open the password manager dialog
const PWMGR_DLG = "chrome://passwordmgr/content/passwordManager.xul";
const PWMGR_DLG = "chrome://passwordmgr/content/passwordManager.xhtml";
let pwmgrdlg = window.openDialog(PWMGR_DLG, "Toolkit:PasswordManager", "");
SimpleTest.waitForFocus(doTest, pwmgrdlg);

2
toolkit/components/passwordmgr/test/browser/browser_passwordmgr_switchtab.js
View File

@@ -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/. */
const PROMPT_URL = "chrome://global/content/commonDialog.xul";
const PROMPT_URL = "chrome://global/content/commonDialog.xhtml";
add_task(async function test() {
await new Promise(resolve => {

2
toolkit/components/passwordmgr/test/browser/browser_passwordmgrdlg.js
View File

@@ -87,7 +87,7 @@ add_task(async function test() {
logins.forEach(login => Services.logins.addLogin(login));
// Open the password manager dialog
const PWMGR_DLG = "chrome://passwordmgr/content/passwordManager.xul";
const PWMGR_DLG = "chrome://passwordmgr/content/passwordManager.xhtml";
let pwmgrdlg = window.openDialog(PWMGR_DLG, "Toolkit:PasswordManager", "");
SimpleTest.waitForFocus(doTest, pwmgrdlg);

7
toolkit/components/passwordmgr/test/browser/browser_private_window.js
View File

@@ -19,7 +19,7 @@ async function focusWindow(win) {
function getDialogDoc() {
// Trudge through all the open windows, until we find the one
// that has either commonDialog.xul or selectDialog.xul loaded.
// that has either commonDialog.xhtml or selectDialog.xhtml loaded.
// var enumerator = Services.wm.getEnumerator("navigator:browser");
for (let { docShell } of Services.wm.getEnumerator(null)) {
var containedDocShells = docShell.getAllDocShellsInSubtree(
@@ -34,8 +34,9 @@ function getDialogDoc() {
}
var childDoc = childDocShell.contentViewer.DOMDocument;
if (
childDoc.location.href != "chrome://global/content/commonDialog.xul" &&
childDoc.location.href != "chrome://global/content/selectDialog.xul"
childDoc.location.href !=
"chrome://global/content/commonDialog.xhtml" &&
childDoc.location.href != "chrome://global/content/selectDialog.xhtml"
) {
continue;
}

4
toolkit/components/passwordmgr/test/browser/browser_username_select_dialog.js
View File

@@ -6,7 +6,7 @@
// Copied from prompt_common.js. TODO: share the code.
function getSelectDialogDoc() {
// Trudge through all the open windows, until we find the one
// that has selectDialog.xul loaded.
// that has selectDialog.xhtml loaded.
// var enumerator = Services.wm.getEnumerator("navigator:browser");
for (let { docShell } of Services.wm.getEnumerator(null)) {
var containedDocShells = docShell.getAllDocShellsInSubtree(
@@ -21,7 +21,7 @@ function getSelectDialogDoc() {
var childDoc = childDocShell.contentViewer.DOMDocument;
if (
childDoc.location.href == "chrome://global/content/selectDialog.xul"
childDoc.location.href == "chrome://global/content/selectDialog.xhtml"
) {
return childDoc;
}

0
toolkit/components/printing/content/printPageSetup.xul → toolkit/components/printing/content/printPageSetup.xhtml
View File

2
toolkit/components/printing/content/printPreviewProgress.js
View File

@@ -104,7 +104,7 @@ function onLoad() {
}
if (!printProgress) {
dump("Invalid argument to printPreviewProgress.xul\n");
dump("Invalid argument to printPreviewProgress.xhtml\n");
window.close();
return;
}

0
toolkit/components/printing/content/printPreviewProgress.xul → toolkit/components/printing/content/printPreviewProgress.xhtml
View File

2
toolkit/components/printing/content/printProgress.js
View File

@@ -177,7 +177,7 @@ function onLoad() {
}
if (!printProgress) {
dump("Invalid argument to printProgress.xul\n");
dump("Invalid argument to printProgress.xhtml\n");
window.close();
return;
}

0
toolkit/components/printing/content/printProgress.xul → toolkit/components/printing/content/printProgress.xhtml
View File

6
toolkit/components/printing/jar.mn
View File

@@ -6,12 +6,12 @@ toolkit.jar:
#ifndef XP_MACOSX
#ifdef XP_WIN
content/global/printPageSetup.js (content/printPageSetup.js)
content/global/printPageSetup.xul (content/printPageSetup.xul)
content/global/printPageSetup.xhtml (content/printPageSetup.xhtml)
#endif
content/global/printPreviewProgress.js (content/printPreviewProgress.js)
content/global/printPreviewProgress.xul (content/printPreviewProgress.xul)
content/global/printPreviewProgress.xhtml (content/printPreviewProgress.xhtml)
content/global/printProgress.js (content/printProgress.js)
content/global/printProgress.xul (content/printProgress.xul)
content/global/printProgress.xhtml (content/printProgress.xhtml)
#endif
content/global/printPreviewToolbar.js (content/printPreviewToolbar.js)
content/global/printUtils.js (content/printUtils.js)

4
toolkit/components/printingui/nsPrintingPromptService.cpp
View File

@@ -20,9 +20,9 @@
# include "nsPrintProgressParams.h"
static const char* kPrintProgressDialogURL =
"chrome://global/content/printProgress.xul";
"chrome://global/content/printProgress.xhtml";
static const char* kPrtPrvProgressDialogURL =
"chrome://global/content/printPreviewProgress.xul";
"chrome://global/content/printPreviewProgress.xhtml";
#endif
using namespace mozilla;

0
toolkit/components/prompts/content/commonDialog.xul → toolkit/components/prompts/content/commonDialog.xhtml
View File

0
toolkit/components/prompts/content/selectDialog.xul → toolkit/components/prompts/content/selectDialog.xhtml
View File

4
toolkit/components/prompts/jar.mn
View File

@@ -4,9 +4,9 @@
toolkit.jar:
content/global/commonDialog.js (content/commonDialog.js)
* content/global/commonDialog.xul (content/commonDialog.xul)
* content/global/commonDialog.xhtml (content/commonDialog.xhtml)
content/global/commonDialog.css (content/commonDialog.css)
content/global/selectDialog.js (content/selectDialog.js)
content/global/selectDialog.xul (content/selectDialog.xul)
content/global/selectDialog.xhtml (content/selectDialog.xhtml)
content/global/tabprompts.css (content/tabprompts.css)
content/global/tabprompts.jsm (content/tabprompts.jsm)

4
toolkit/components/prompts/src/Prompter.jsm
View File

@@ -680,8 +680,8 @@ ModalPrompter.prototype = {
return;
}
const COMMON_DIALOG = "chrome://global/content/commonDialog.xul";
const SELECT_DIALOG = "chrome://global/content/selectDialog.xul";
const COMMON_DIALOG = "chrome://global/content/commonDialog.xhtml";
const SELECT_DIALOG = "chrome://global/content/selectDialog.xhtml";
let uri = args.promptType == "select" ? SELECT_DIALOG : COMMON_DIALOG;
let propBag = PromptUtils.objectToPropBag(args);

7
toolkit/components/prompts/test/chromeScript.js
View File

@@ -219,7 +219,7 @@ function dismissPrompt(ui, action) {
function getDialogDoc() {
// Trudge through all the open windows, until we find the one
// that has either commonDialog.xul or selectDialog.xul loaded.
// that has either commonDialog.xhtml or selectDialog.xhtml loaded.
// var enumerator = Services.wm.getEnumerator("navigator:browser");
for (let { docShell } of Services.wm.getEnumerator(null)) {
var containedDocShells = docShell.getAllDocShellsInSubtree(
@@ -235,8 +235,9 @@ function getDialogDoc() {
var childDoc = childDocShell.contentViewer.DOMDocument;
if (
childDoc.location.href != "chrome://global/content/commonDialog.xul" &&
childDoc.location.href != "chrome://global/content/selectDialog.xul"
childDoc.location.href !=
"chrome://global/content/commonDialog.xhtml" &&
childDoc.location.href != "chrome://global/content/selectDialog.xhtml"
) {
continue;
}

0
toolkit/components/viewconfig/content/config.xul → toolkit/components/viewconfig/content/config.xhtml
View File

2
toolkit/components/viewconfig/jar.mn
View File

@@ -3,5 +3,5 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
toolkit.jar:
content/global/config.xul (content/config.xul)
content/global/config.xhtml (content/config.xhtml)
content/global/config.js (content/config.js)

4
toolkit/content/aboutProfiles.js
View File

@@ -200,7 +200,7 @@ function display(profileData) {
div.appendChild(sep);
}
// This is called from the createProfileWizard.xul dialog.
// This is called from the createProfileWizard.xhtml dialog.
function CreateProfile(profile) {
// The wizard created a profile, just make it the default.
defaultProfile(profile);
@@ -209,7 +209,7 @@ function CreateProfile(profile) {
function createProfileWizard() {
// This should be rewritten in HTML eventually.
window.docShell.rootTreeItem.domWindow.openDialog(
"chrome://mozapps/content/profile/createProfileWizard.xul",
"chrome://mozapps/content/profile/createProfileWizard.xhtml",
"",
"centerscreen,chrome,modal,titlebar",
ProfileService,

2
toolkit/content/customElements.js
View File

@@ -770,7 +770,7 @@
// For now, don't load any elements in the extension dummy document.
// We will want to load <browser> when that's migrated (bug 1441935).
const isDummyDocument =
document.documentURI == "chrome://extensions/content/dummy.xul";
document.documentURI == "chrome://extensions/content/dummy.xhtml";
if (!isDummyDocument) {
for (let script of [
"chrome://global/content/elements/arrowscrollbox.js",

0
toolkit/content/editMenuKeys.inc.xul → toolkit/content/editMenuKeys.inc.xhtml
View File

4
toolkit/content/jar.mn
View File

@@ -52,8 +52,8 @@ toolkit.jar:
content/global/process-content.js
content/global/resetProfile.css
content/global/resetProfile.js
content/global/resetProfile.xul
content/global/resetProfileProgress.xul
content/global/resetProfile.xhtml
content/global/resetProfileProgress.xhtml
content/global/TopLevelVideoDocument.js
content/global/timepicker.xhtml
content/global/treeUtils.js

0
toolkit/content/resetProfile.xul → toolkit/content/resetProfile.xhtml
View File

0
toolkit/content/resetProfileProgress.xul → toolkit/content/resetProfileProgress.xhtml
View File

2
toolkit/modules/HiddenFrame.jsm
View File

@@ -11,7 +11,7 @@ const { PromiseUtils } = ChromeUtils.import(
);
const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const XUL_PAGE = "chrome://global/content/win.xul";
const XUL_PAGE = "chrome://global/content/win.xhtml";
const gAllHiddenFrames = new Set();

2
toolkit/modules/ResetProfile.jsm
View File

@@ -55,7 +55,7 @@ var ResetProfile = {
reset: false,
};
window.docShell.rootTreeItem.domWindow.openDialog(
"chrome://global/content/resetProfile.xul",
"chrome://global/content/resetProfile.xhtml",
null,
"modal,centerscreen,titlebar",
params

2
toolkit/modules/jar.mn
View File

@@ -3,4 +3,4 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
toolkit.jar:
content/global/win.xul (win.xul)
content/global/win.xhtml (win.xhtml)

0
toolkit/modules/win.xul → toolkit/modules/win.xhtml
View File

2
toolkit/mozapps/downloads/HelperAppDlg.jsm
View File

@@ -1185,7 +1185,7 @@ nsUnknownContentTypeDialog.prototype = {
params.handlerApp = null;
this.mDialog.openDialog(
"chrome://global/content/appPicker.xul",
"chrome://global/content/appPicker.xhtml",
null,
"chrome,modal,centerscreen,titlebar,dialog=yes",
params

2
toolkit/mozapps/extensions/test/xpinstall/head.js
View File

@@ -8,7 +8,7 @@ const RELATIVE_DIR = "toolkit/mozapps/extensions/test/xpinstall/";
const TESTROOT = "http://example.com/browser/" + RELATIVE_DIR;
const TESTROOT2 = "http://example.org/browser/" + RELATIVE_DIR;
const PROMPT_URL = "chrome://global/content/commonDialog.xul";
const PROMPT_URL = "chrome://global/content/commonDialog.xhtml";
const ADDONS_URL = "chrome://mozapps/content/extensions/extensions.xul";
const PREF_LOGGING_ENABLED = "extensions.logging.enabled";
const PREF_INSTALL_REQUIREBUILTINCERTS =

0
toolkit/profile/content/createProfileWizard.xul → toolkit/profile/content/createProfileWizard.xhtml
View File

0
toolkit/profile/content/profileDowngrade.xul → toolkit/profile/content/profileDowngrade.xhtml
View File

2
toolkit/profile/content/profileSelection.js
View File

@@ -207,7 +207,7 @@ function onProfilesDblClick(aEvent) {
// invoke the createProfile Wizard
function CreateProfileWizard() {
window.openDialog(
"chrome://mozapps/content/profile/createProfileWizard.xul",
"chrome://mozapps/content/profile/createProfileWizard.xhtml",
"",
"centerscreen,chrome,modal,titlebar",
gProfileService,

0
toolkit/profile/content/profileSelection.xul → toolkit/profile/content/profileSelection.xhtml
View File

6
toolkit/profile/jar.mn
View File

@@ -4,10 +4,10 @@
toolkit.jar:
content/mozapps/profile/createProfileWizard.js (content/createProfileWizard.js)
* content/mozapps/profile/createProfileWizard.xul (content/createProfileWizard.xul)
* content/mozapps/profile/createProfileWizard.xhtml (content/createProfileWizard.xhtml)
content/mozapps/profile/profileSelection.js (content/profileSelection.js)
content/mozapps/profile/profileSelection.xul (content/profileSelection.xul)
content/mozapps/profile/profileSelection.xhtml (content/profileSelection.xhtml)
#ifdef MOZ_BLOCK_PROFILE_DOWNGRADE
content/mozapps/profile/profileDowngrade.js (content/profileDowngrade.js)
* content/mozapps/profile/profileDowngrade.xul (content/profileDowngrade.xul)
* content/mozapps/profile/profileDowngrade.xhtml (content/profileDowngrade.xhtml)
#endif

2
toolkit/xre/ProfileReset.h
View File

@@ -9,7 +9,7 @@
static bool gProfileResetCleanupCompleted = false;
static const char kResetProgressURL[] =
"chrome://global/content/resetProfileProgress.xul";
"chrome://global/content/resetProfileProgress.xhtml";
nsresult ProfileResetCleanup(nsToolkitProfileService* aService,
nsIToolkitProfile* aOldProfile);

4
toolkit/xre/nsAppRunner.cpp
View File

@@ -1796,7 +1796,7 @@ static ReturnAbortOnError ProfileLockedDialog(nsIFile* aProfileDir,
}
static const char kProfileManagerURL[] =
"chrome://mozapps/content/profile/profileSelection.xul";
"chrome://mozapps/content/profile/profileSelection.xhtml";
static ReturnAbortOnError ShowProfileManager(
nsIToolkitProfileService* aProfileSvc, nsINativeAppSupport* aNative) {
@@ -2184,7 +2184,7 @@ static void SubmitDowngradeTelemetry(const nsCString& aLastVersion,
}
static const char kProfileDowngradeURL[] =
"chrome://mozapps/content/profile/profileDowngrade.xul";
"chrome://mozapps/content/profile/profileDowngrade.xhtml";
static ReturnAbortOnError CheckDowngrade(nsIFile* aProfileDir,
nsINativeAppSupport* aNative,

2
widget/windows/nsPrintDialogWin.cpp
View File

@@ -23,7 +23,7 @@
#include "nsQueryObject.h"
static const char* kPageSetupDialogURL =
"chrome://global/content/printPageSetup.xul";
"chrome://global/content/printPageSetup.xhtml";
using namespace mozilla;
using namespace mozilla::widget;