Commit ae7be057 authored by Emma Malysz's avatar Emma Malysz
Browse files

Bug 1596869, rename .xul files in security/manager to .xhtml r=keeler

Differential Revision: https://phabricator.services.mozilla.com/D54198

--HG--
rename : security/manager/pki/resources/content/certManager.xul => security/manager/pki/resources/content/certManager.xhtml
rename : security/manager/pki/resources/content/certViewer.xul => security/manager/pki/resources/content/certViewer.xhtml
rename : security/manager/pki/resources/content/changepassword.xul => security/manager/pki/resources/content/changepassword.xhtml
rename : security/manager/pki/resources/content/clientauthask.xul => security/manager/pki/resources/content/clientauthask.xhtml
rename : security/manager/pki/resources/content/deletecert.xul => security/manager/pki/resources/content/deletecert.xhtml
rename : security/manager/pki/resources/content/device_manager.xul => security/manager/pki/resources/content/device_manager.xhtml
rename : security/manager/pki/resources/content/downloadcert.xul => security/manager/pki/resources/content/downloadcert.xhtml
rename : security/manager/pki/resources/content/editcacert.xul => security/manager/pki/resources/content/editcacert.xhtml
rename : security/manager/pki/resources/content/exceptionDialog.xul => security/manager/pki/resources/content/exceptionDialog.xhtml
rename : security/manager/pki/resources/content/load_device.xul => security/manager/pki/resources/content/load_device.xhtml
rename : security/manager/pki/resources/content/protectedAuth.xul => security/manager/pki/resources/content/protectedAuth.xhtml
rename : security/manager/pki/resources/content/resetpassword.xul => security/manager/pki/resources/content/resetpassword.xhtml
rename : security/manager/pki/resources/content/setp12password.xul => security/manager/pki/resources/content/setp12password.xhtml
extra : moz-landing-system : lando
parent 84cba41e
......@@ -349,7 +349,7 @@ class NetErrorParent extends JSWindowActorParent {
} else {
Services.ww.openWindow(
window,
"chrome://pippki/content/certViewer.xul",
"chrome://pippki/content/certViewer.xhtml",
"_blank",
"centerscreen,chrome",
cert
......
......@@ -43,7 +43,7 @@ var security = {
} else {
Services.ww.openWindow(
window,
"chrome://pippki/content/certViewer.xul",
"chrome://pippki/content/certViewer.xhtml",
"_blank",
"centerscreen,chrome",
this.securityInfo.cert
......
......@@ -72,7 +72,7 @@ var whitelist = [
{ file: "chrome://pdf.js/locale/viewer.properties" },
// security/manager/pki/resources/content/device_manager.js
{ file: "chrome://pippki/content/load_device.xul" },
{ file: "chrome://pippki/content/load_device.xhtml" },
// The l10n build system can't package string files only for some platforms.
// See bug 1339424 for why this is hard to fix.
......@@ -187,7 +187,7 @@ var whitelist = [
platforms: ["linux", "win"],
},
// Bug 1348559
{ file: "chrome://pippki/content/resetpassword.xul" },
{ file: "chrome://pippki/content/resetpassword.xhtml" },
// Bug 1337345
{ file: "resource://gre/modules/Manifest.jsm" },
// Bug 1356045
......
......@@ -10,7 +10,7 @@ const mpToken = Cc["@mozilla.org/security/pk11tokendb;1"]
async function checkDeviceManager({ buttonIsDisabled }) {
let deviceManagerWindow = window.openDialog(
"chrome://pippki/content/device_manager.xul",
"chrome://pippki/content/device_manager.xhtml",
"",
""
);
......
......@@ -2144,14 +2144,14 @@ var gPrivacyPane = {
* Displays the user's certificates and associated options.
*/
showCertificates() {
gSubDialog.open("chrome://pippki/content/certManager.xul");
gSubDialog.open("chrome://pippki/content/certManager.xhtml");
},
/**
* Displays a dialog from which the user can manage his security devices.
*/
showSecurityDevices() {
gSubDialog.open("chrome://pippki/content/device_manager.xul");
gSubDialog.open("chrome://pippki/content/device_manager.xhtml");
},
initDataCollection() {
......
......@@ -47,7 +47,7 @@ async function setupTest() {
);
certButton.scrollIntoView();
let certDialogLoaded = promiseLoadSubDialog(
"chrome://pippki/content/certManager.xul"
"chrome://pippki/content/certManager.xhtml"
);
certButton.click();
dialogWin = await certDialogLoaded;
......
......@@ -7,7 +7,7 @@
// window or from the SSL error page (see bug 461627).
function test() {
const EXCEPTIONS_DLG_URL = "chrome://pippki/content/exceptionDialog.xul";
const EXCEPTIONS_DLG_URL = "chrome://pippki/content/exceptionDialog.xhtml";
const EXCEPTIONS_DLG_FEATURES = "chrome,centerscreen";
const INVALID_CERT_LOCATION = "https://nocert.example.com/";
waitForExplicitFinish();
......
......@@ -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/. -->
<!-- Values for changepassword.xul -->
<!-- Values for changepassword.xhtml -->
<!ENTITY setPassword.title "Change Master Password">
<!ENTITY setPassword.tokenName.label "Security Device">
<!ENTITY setPassword.oldPassword.label "Current password:">
......@@ -10,7 +10,7 @@
<!ENTITY setPassword.reenterPassword.label "New password (again):">
<!ENTITY setPassword.meter.label "Password quality meter">
<!-- Values for resetpassword.xul -->
<!-- Values for resetpassword.xhtml -->
<!ENTITY resetPasswordButtonLabel "Reset">
<!ENTITY resetPassword.title "Reset Master Password">
<!ENTITY resetPassword.text "If you reset your master password, all your stored web and e-mail passwords, form data, personal certificates, and private keys will be forgotten. Are you sure you want to reset your master password?">
......
......@@ -78,7 +78,7 @@ nsNSSDialogs::SetPassword(nsIInterfaceRequestor* ctx, nsIPK11Token* token,
}
rv = nsNSSDialogHelper::openDialog(
parent, "chrome://pippki/content/changepassword.xul", block);
parent, "chrome://pippki/content/changepassword.xhtml", block);
if (NS_FAILED(rv)) return rv;
......@@ -121,7 +121,7 @@ nsNSSDialogs::ConfirmDownloadCACert(nsIInterfaceRequestor* ctx,
// Get the parent window for the dialog
nsCOMPtr<mozIDOMWindowProxy> parent = do_GetInterface(ctx);
rv = nsNSSDialogHelper::openDialog(
parent, "chrome://pippki/content/downloadcert.xul", argArray);
parent, "chrome://pippki/content/downloadcert.xhtml", argArray);
if (NS_FAILED(rv)) {
return rv;
}
......@@ -228,7 +228,7 @@ nsNSSDialogs::ChooseCertificate(const nsACString& hostname, int32_t port,
}
rv = nsNSSDialogHelper::openDialog(
nullptr, "chrome://pippki/content/clientauthask.xul", argArray);
nullptr, "chrome://pippki/content/clientauthask.xhtml", argArray);
if (NS_FAILED(rv)) {
return rv;
}
......@@ -266,7 +266,7 @@ nsNSSDialogs::SetPKCS12FilePassword(nsIInterfaceRequestor* ctx,
nsCOMPtr<mozIDOMWindowProxy> parent = do_GetInterface(ctx);
nsCOMPtr<nsIWritablePropertyBag2> retVals = new nsHashPropertyBag();
nsresult rv = nsNSSDialogHelper::openDialog(
parent, "chrome://pippki/content/setp12password.xul", retVals);
parent, "chrome://pippki/content/setp12password.xhtml", retVals);
if (NS_FAILED(rv)) {
return rv;
}
......@@ -343,7 +343,7 @@ nsNSSDialogs::DisplayProtectedAuth(nsIInterfaceRequestor* aCtx,
nsCOMPtr<mozIDOMWindowProxy> newWindow;
rv = windowWatcher->OpenWindow(
parent, "chrome://pippki/content/protectedAuth.xul", "_blank",
parent, "chrome://pippki/content/protectedAuth.xhtml", "_blank",
"centerscreen,chrome,modal,titlebar,close=no", runnable,
getter_AddRefs(newWindow));
......
......@@ -333,7 +333,7 @@ function editCerts() {
for (let cert of selected_certs) {
window.docShell.rootTreeItem.domWindow.openDialog(
"chrome://pippki/content/editcacert.xul",
"chrome://pippki/content/editcacert.xhtml",
"",
"chrome,centerscreen,modal",
cert
......@@ -461,7 +461,7 @@ function deleteCerts() {
deleteConfirmed: false,
};
window.docShell.rootTreeItem.domWindow.openDialog(
"chrome://pippki/content/deletecert.xul",
"chrome://pippki/content/deletecert.xhtml",
"",
"chrome,centerscreen,modal",
selTabID,
......@@ -534,7 +534,7 @@ async function addEmailCert() {
function addException() {
window.docShell.rootTreeItem.domWindow.openDialog(
"chrome://pippki/content/exceptionDialog.xul",
"chrome://pippki/content/exceptionDialog.xhtml",
"",
"chrome,centerscreen,modal"
);
......
......@@ -6,7 +6,7 @@
"use strict";
/**
* @file Implements functionality for certViewer.xul and its general and details
* @file Implements functionality for certViewer.xhtml and its general and details
* tabs.
* @argument {nsISupports} window.arguments[0]
* The cert to view, queryable to nsIX509Cert.
......
......@@ -7,7 +7,7 @@
"use strict";
/**
* @file Implements the functionality of clientauthask.xul: a dialog that allows
* @file Implements the functionality of clientauthask.xhtml: a dialog that allows
* a user pick a client certificate for TLS client authentication.
* @argument {String} window.arguments[0]
* The hostname of the server requesting client authentication.
......
......@@ -5,10 +5,10 @@
"use strict";
/**
* @file Implements the functionality of deletecert.xul: a dialog that allows a
* @file Implements the functionality of deletecert.xhtml: a dialog that allows a
* user to confirm whether to delete certain certificates.
* @argument {String} window.arguments[0]
* One of the tab IDs listed in certManager.xul.
* One of the tab IDs listed in certManager.xhtml.
* @argument {nsICertTreeItem[]} window.arguments[1]
* An array of cert tree items representing the certs to delete.
* @argument {DeleteCertReturnValues} window.arguments[2]
......
......@@ -327,7 +327,7 @@ function doLogout() {
// load a new device
function doLoad() {
window.docShell.rootTreeItem.domWindow.open(
"load_device.xul",
"load_device.xhtml",
"loaddevice",
"chrome,centerscreen,modal"
);
......@@ -366,7 +366,7 @@ function changePassword() {
objects.appendElement(selected_slot.getToken());
params.objects = objects;
window.docShell.rootTreeItem.domWindow.openDialog(
"changepassword.xul",
"changepassword.xhtml",
"",
"chrome,centerscreen,modal",
params
......
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