Commit 210f4134 authored by Brindusan Cristian's avatar Brindusan Cristian
Browse files

Backed out changeset f90a969f785c (bug 1596869) for bc failures on...

Backed out changeset f90a969f785c (bug 1596869) for bc failures on browser_clientAuth_ui.js. CLOSED TREE

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