summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordpapad <dpapad@chromium.org>2016-03-25 11:09:21 -0700
committerCommit bot <commit-bot@chromium.org>2016-03-25 18:11:31 +0000
commit9955328cf27c93eeb74d88dde61e332c00448d95 (patch)
tree46bb81a18b12962d6c2a6453f558fe3bbf951b52
parent4a4810000a1427e81ad9dbb60e28dbf17a0e2560 (diff)
downloadchromium_src-9955328cf27c93eeb74d88dde61e332c00448d95.zip
chromium_src-9955328cf27c93eeb74d88dde61e332c00448d95.tar.gz
chromium_src-9955328cf27c93eeb74d88dde61e332c00448d95.tar.bz2
MD Settings: Certificate manager, respect USE_NSS_CERTS.
Specifically, including certificate manager only when USE_NSS_CERTS is true. Also updating strings, resources and tests accordingly. BUG=547073 Review URL: https://codereview.chromium.org/1831093002 Cr-Commit-Position: refs/heads/master@{#383310}
-rw-r--r--chrome/app/settings_strings.grdp348
-rw-r--r--chrome/browser/resources/settings/privacy_page/privacy_page.html4
-rw-r--r--chrome/browser/resources/settings/privacy_page/privacy_page.js5
-rw-r--r--chrome/browser/resources/settings/settings_resources.grd93
-rw-r--r--chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc4
-rw-r--r--chrome/test/data/webui/settings/cr_settings_browsertest.js2
6 files changed, 238 insertions, 218 deletions
diff --git a/chrome/app/settings_strings.grdp b/chrome/app/settings_strings.grdp
index b93cb0b..cbad0cf 100644
--- a/chrome/app/settings_strings.grdp
+++ b/chrome/app/settings_strings.grdp
@@ -205,183 +205,185 @@
</message>
</if>
- <!-- Certificate Manager Page -->
- <message name="IDS_SETTINGS_CERTIFICATE_MANAGER" desc="Name of the certificate manager page which allows users to modify SSL certificate settings.">
- Certificate manager
- </message>
- <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_YOUR_CERTIFICATES" desc="Label for the your certificates tab in certificate manager.">
- Your certificates
- </message>
- <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_SERVERS" desc="Label for the servers tab in certificate manager.">
- Servers
- </message>
- <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_SERVERS_IDENTIFY" desc="Label for servers subtitle tab in certificate manager.">
- You have certificates on file that identify these servers:
- </message>
- <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_AUTHORITIES" desc="Label for the authorities tab in certificate manager.">
- Authorities
- </message>
- <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_AUTHORITIES_YOU_HAVE_AUTHORITIES" desc="Label for authorities subtitle tab in certificate manager.">
- You have certificates on file that identify these certificate authorities:
- </message>
- <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_OTHERS_YOU_HAVE_OTHERS" desc="Label for others subtitle tab in certificate manager.">
- You have certificates on file that do not fit in any of the other categories:
- </message>
- <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_VIEW" desc="Label for view button in certificate manager.">
- View
- </message>
- <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_IMPORT" desc="Label for import button in certificate manager.">
- Import
- </message>
- <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_IMPORT_AND_BIND" desc="Label for import and bind button in certificate manager.">
- Import and Bind to Device
- </message>
- <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_EXPORT" desc="Label for export button in certificate manager.">
- Export
- </message>
- <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_DELETE" desc="Label for delete button in certificate manager.">
- Delete
- </message>
- <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_DONE" desc="Label for done button in certificate manager.">
- Done
- </message>
- <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_OTHERS" desc="Label for the others tab in certificate manager.">
- Others
- </message>
- <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_YOU_HAVE_CERTIFICATES" desc="Label for your certificates subtitle tab in certificate manager.">
- You have certificates from these organizations that identify you:
- </message>
- <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_USAGE_SSL_CLIENT" desc="The description of a certificate that is verified for use as an SSL client">
- SSL Client Certificate
- </message>
+ <if expr="use_nss_certs">
+ <!-- Certificate Manager Page -->
+ <message name="IDS_SETTINGS_CERTIFICATE_MANAGER" desc="Name of the certificate manager page which allows users to modify SSL certificate settings.">
+ Certificate manager
+ </message>
+ <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_YOUR_CERTIFICATES" desc="Label for the your certificates tab in certificate manager.">
+ Your certificates
+ </message>
+ <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_SERVERS" desc="Label for the servers tab in certificate manager.">
+ Servers
+ </message>
+ <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_SERVERS_IDENTIFY" desc="Label for servers subtitle tab in certificate manager.">
+ You have certificates on file that identify these servers:
+ </message>
+ <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_AUTHORITIES" desc="Label for the authorities tab in certificate manager.">
+ Authorities
+ </message>
+ <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_AUTHORITIES_YOU_HAVE_AUTHORITIES" desc="Label for authorities subtitle tab in certificate manager.">
+ You have certificates on file that identify these certificate authorities:
+ </message>
+ <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_OTHERS_YOU_HAVE_OTHERS" desc="Label for others subtitle tab in certificate manager.">
+ You have certificates on file that do not fit in any of the other categories:
+ </message>
+ <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_VIEW" desc="Label for view button in certificate manager.">
+ View
+ </message>
+ <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_IMPORT" desc="Label for import button in certificate manager.">
+ Import
+ </message>
+ <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_IMPORT_AND_BIND" desc="Label for import and bind button in certificate manager.">
+ Import and Bind to Device
+ </message>
+ <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_EXPORT" desc="Label for export button in certificate manager.">
+ Export
+ </message>
+ <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_DELETE" desc="Label for delete button in certificate manager.">
+ Delete
+ </message>
+ <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_DONE" desc="Label for done button in certificate manager.">
+ Done
+ </message>
+ <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_OTHERS" desc="Label for the others tab in certificate manager.">
+ Others
+ </message>
+ <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_YOU_HAVE_CERTIFICATES" desc="Label for your certificates subtitle tab in certificate manager.">
+ You have certificates from these organizations that identify you:
+ </message>
+ <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_USAGE_SSL_CLIENT" desc="The description of a certificate that is verified for use as an SSL client">
+ SSL Client Certificate
+ </message>
- <!-- Certificate Manager Page, edit certificate authority trust dialog-->
- <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_CA_TRUST_EDIT_DIALOG_TITLE" desc="Title of the certificate manager edit trust dialog">
- Certificate authority
- </message>
- <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_CA_TRUST_EDIT_DIALOG_DESCRIPTION" desc="Line displayed in certificate manager edit trust dialog before the checkboxes for setting certificate trust flags">
- Edit trust settings:
- </message>
- <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_CA_TRUST_EDIT_DIALOG_EXPLANATION" desc="Description in dialog for editing Certification Authority trust flags">
- The certificate "<ph name="CERTIFICATE_NAME">$1<ex>Verisign Class 1 Public Primary Certification Authority</ex></ph>" represents a Certification Authority.
- </message>
- <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_CA_TRUST_EDIT_DIALOG_SSL" desc="Description in Certification Authority trust dialog for the SSL trust checkbox.">
- Trust this certificate for identifying websites.
- </message>
- <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_CA_TRUST_EDIT_DIALOG_EMAIL" desc="Description in Certification Authority trust dialog for the Email trust checkbox.">
- Trust this certificate for identifying email users.
- </message>
- <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_CA_TRUST_EDIT_DIALOG_OBJ_SIGN" desc="Description in Certification Authority trust dialog for the Code Signing trust checkbox.">
- Trust this certificate for identifying software makers.
- </message>
+ <!-- Certificate Manager Page, edit certificate authority trust dialog-->
+ <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_CA_TRUST_EDIT_DIALOG_TITLE" desc="Title of the certificate manager edit trust dialog">
+ Certificate authority
+ </message>
+ <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_CA_TRUST_EDIT_DIALOG_DESCRIPTION" desc="Line displayed in certificate manager edit trust dialog before the checkboxes for setting certificate trust flags">
+ Edit trust settings:
+ </message>
+ <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_CA_TRUST_EDIT_DIALOG_EXPLANATION" desc="Description in dialog for editing Certification Authority trust flags">
+ The certificate "<ph name="CERTIFICATE_NAME">$1<ex>Verisign Class 1 Public Primary Certification Authority</ex></ph>" represents a Certification Authority.
+ </message>
+ <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_CA_TRUST_EDIT_DIALOG_SSL" desc="Description in Certification Authority trust dialog for the SSL trust checkbox.">
+ Trust this certificate for identifying websites.
+ </message>
+ <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_CA_TRUST_EDIT_DIALOG_EMAIL" desc="Description in Certification Authority trust dialog for the Email trust checkbox.">
+ Trust this certificate for identifying email users.
+ </message>
+ <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_CA_TRUST_EDIT_DIALOG_OBJ_SIGN" desc="Description in Certification Authority trust dialog for the Code Signing trust checkbox.">
+ Trust this certificate for identifying software makers.
+ </message>
- <!-- Certificate Manager Page, delete certificate confirmation dialog -->
- <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_DELETE_USER_TITLE" desc="Title of a certificate manager dialog for confirming deletion of a user certificate">
- Delete certificate "<ph name="CERTIFICATE_NAME">$1<ex>VeriSign Browser Certificate</ex></ph>"?
- </message>
- <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_DELETE_USER_DESCRIPTION" desc="Description of impact of deleting a user certificate">
- If you delete one of your own certificates, you can no longer use it to identify yourself.
- </message>
- <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_DELETE_SERVER_TITLE" desc="Title of a certificate manager dialog for confirming deletion of a server certificate">
- Delete server certificate "<ph name="CERTIFICATE_NAME">$1<ex>www.example.com</ex></ph>"?
- </message>
- <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_DELETE_SERVER_DESCRIPTION" desc="Description of impact of deleting a user certificate">
- If you delete a server certificate, you restore the usual security checks for that server and require it uses a valid certificate.
- </message>
- <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_DELETE_CA_TITLE" desc="Title of a certificate manager dialog for confirming deletion of a certification authority certificate">
- Delete CA certificate "<ph name="CERTIFICATE_NAME">$1<ex>Verisign Class 1 Public Primary Certification Authority</ex></ph>"?
- </message>
- <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_DELETE_CA_DESCRIPTION" desc="Description of impact of deleting a user certificate">
- If you delete a Certification Authority (CA) certificate, your browser will no longer trust any certificates issued by that CA.
- </message>
- <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_DELETE_OTHER_TITLE" desc="Title of a certificate manager dialog for confirming deletion of a certificate of other type">
- Delete certificate "<ph name="CERTIFICATE_NAME">$1<ex>Example Certificate</ex></ph>"?
- </message>
+ <!-- Certificate Manager Page, delete certificate confirmation dialog -->
+ <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_DELETE_USER_TITLE" desc="Title of a certificate manager dialog for confirming deletion of a user certificate">
+ Delete certificate "<ph name="CERTIFICATE_NAME">$1<ex>VeriSign Browser Certificate</ex></ph>"?
+ </message>
+ <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_DELETE_USER_DESCRIPTION" desc="Description of impact of deleting a user certificate">
+ If you delete one of your own certificates, you can no longer use it to identify yourself.
+ </message>
+ <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_DELETE_SERVER_TITLE" desc="Title of a certificate manager dialog for confirming deletion of a server certificate">
+ Delete server certificate "<ph name="CERTIFICATE_NAME">$1<ex>www.example.com</ex></ph>"?
+ </message>
+ <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_DELETE_SERVER_DESCRIPTION" desc="Description of impact of deleting a user certificate">
+ If you delete a server certificate, you restore the usual security checks for that server and require it uses a valid certificate.
+ </message>
+ <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_DELETE_CA_TITLE" desc="Title of a certificate manager dialog for confirming deletion of a certification authority certificate">
+ Delete CA certificate "<ph name="CERTIFICATE_NAME">$1<ex>Verisign Class 1 Public Primary Certification Authority</ex></ph>"?
+ </message>
+ <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_DELETE_CA_DESCRIPTION" desc="Description of impact of deleting a user certificate">
+ If you delete a Certification Authority (CA) certificate, your browser will no longer trust any certificates issued by that CA.
+ </message>
+ <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_DELETE_OTHER_TITLE" desc="Title of a certificate manager dialog for confirming deletion of a certificate of other type">
+ Delete certificate "<ph name="CERTIFICATE_NAME">$1<ex>Example Certificate</ex></ph>"?
+ </message>
- <!-- Certificate Manager Page, encrypt/decrypt password dialogs -->
- <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_ENCRYPT_PASSWORD_TITLE" desc="Description of password prompt in certificate manager for exporting a personal certificate">
- Please enter a password to encrypt this certificate file
- </message>
- <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_DECRYPT_PASSWORD_TITLE" desc="Description of password prompt in certificate manager for restoring a personal certificate">
- Please enter the password that was used to encrypt this certificate file
- </message>
- <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_ENCRYPT_PASSWORD_DESCRIPTION" desc="Text in password prompt of certificate manager for exporting a personal certificate, reminding user that if they forget the password they're screwed.">
- The password you choose will be required to restore this file later. Please record it in a safe location.
- </message>
- <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_PASSWORD" desc="The label of the password field in the certificate manager for restoring or exporting a personal certificate">
- Password
- </message>
- <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_CONFIRM_PASSWORD" desc="The label of the field in the certificate manager for re-entering the password when exporting a certificate">
- Confirm Password
- </message>
+ <!-- Certificate Manager Page, encrypt/decrypt password dialogs -->
+ <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_ENCRYPT_PASSWORD_TITLE" desc="Description of password prompt in certificate manager for exporting a personal certificate">
+ Please enter a password to encrypt this certificate file
+ </message>
+ <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_DECRYPT_PASSWORD_TITLE" desc="Description of password prompt in certificate manager for restoring a personal certificate">
+ Please enter the password that was used to encrypt this certificate file
+ </message>
+ <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_ENCRYPT_PASSWORD_DESCRIPTION" desc="Text in password prompt of certificate manager for exporting a personal certificate, reminding user that if they forget the password they're screwed.">
+ The password you choose will be required to restore this file later. Please record it in a safe location.
+ </message>
+ <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_PASSWORD" desc="The label of the password field in the certificate manager for restoring or exporting a personal certificate">
+ Password
+ </message>
+ <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_CONFIRM_PASSWORD" desc="The label of the field in the certificate manager for re-entering the password when exporting a certificate">
+ Confirm Password
+ </message>
- <!-- Certificate Manager Page, error dialog -->
- <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_BAD_PASSWORD" desc="The text in the error dialog for entering an incorrect password when importing an encrypted certificate file.">
- Incorrect password.
- </message>
- <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_CA_IMPORT_ERROR_TITLE" desc="The title in the error dialog for Certification Authority file import errors.">
- Certification Authority Import Error
- </message>
- <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_CERT_PARSE_ERROR" desc="The message in the certificate manager error dialog for importing invalid certificate files.">
- Unable to parse file.
- </message>
- <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_DELETE_CERT_ERROR_TITLE" desc="The title in the error dialog for certificate delete errors.">
- Certificate Deletion Error
- </message>
- <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_ERROR_CERT_ALREADY_EXISTS" desc="The error message when trying to import certificate which already exists.">
- Certificate already exists.
- </message>
- <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_ERROR_NOT_CA" desc="The error message when trying to import certificate authorities and a certificate is not a certification authority">
- Not a Certification Authority.
- </message>
- <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_IMPORT_ALL_NOT_IMPORTED" desc="The header in certificate manager error dialog for list of certificates that could not be imported, when none were successfully imported.">
- The file contained multiple certificates, none of which were imported:
- </message>
- <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_IMPORT_ERROR_TITLE" desc="The title in the error dialog for certificate file import errors.">
- Certificate Import Error
- </message>
- <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_IMPORT_INVALID_FILE" desc="The message in the error dialog for corrupt certificate files.">
- Invalid or corrupt file.
- </message>
- <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_IMPORT_INVALID_MAC" desc="The message in the error dialog for certificate files with invalid MAC.">
- Incorrect password or corrupt file.
- </message>
- <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_IMPORT_MISSING_KEY" desc="The message in the error dialog for certificates without a local private key.">
- The Private Key for this Client Certificate is missing or invalid.
- </message>
- <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_IMPORT_SINGLE_NOT_IMPORTED" desc="The header in certificate manager error dialog for single certificates that could not be imported.">
- The file contained one certificate, which was not imported:
- </message>
- <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_IMPORT_SOME_NOT_IMPORTED" desc="The header in certificate manager error dialog for list of certificates that could not be imported, even though others were.">
- The file contained multiple certificates, some of which were not imported:
- </message>
- <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_IMPORT_UNSUPPORTED" desc="The message in the error dialog for unsupported certificate files.">
- File uses unsupported features.
- </message>
- <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_PKCS12_EXPORT_ERROR_TITLE" desc="The title in the error dialog for PKCS #12 file export errors.">
- PKCS #12 Export Error
- </message>
- <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_PKCS12_FILES" desc="The label in the file selector dialog for PKCS #12 file type.">
- PKCS #12 Files
- </message>
- <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_READ_ERROR_FORMAT" desc="The text in the error dialog for certificate file read errors.">
- There was an error while trying to read the file: <ph name="ERROR_TEXT">$1<ex>File not found.</ex></ph>.
- </message>
- <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_IMPORT_ERROR_FORMAT" desc="The format of per-certificate error messages in import failure dialog">
- <ph name="CERTIFICATE_NAME">$1<ex>www.example.com</ex></ph>: <ph name="ERROR">$2<ex>Not a Certification Authority</ex></ph>
- </message>
- <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_SERVER_IMPORT_ERROR_TITLE" desc="The title in the error dialog for Certification Authority file import errors.">
- Server Certificate Import Error
- </message>
- <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_SET_TRUST_ERROR_TITLE" desc="The title in the error dialog for certificate trust editing errors.">
- Error Setting Certificate Trust
- </message>
- <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_UNKNOWN_ERROR" desc="The text in the error dialog when an unknown error occurs during an operation on the certificate database.">
- Unknown error.
- </message>
- <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_WRITE_ERROR_FORMAT" desc="The text in the error dialog for PKCS #12 file write errors.">
- There was an error while trying to write the file: <ph name="ERROR_TEXT">$1<ex>Permission denied.</ex></ph>.
- </message>
+ <!-- Certificate Manager Page, error dialog -->
+ <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_BAD_PASSWORD" desc="The text in the error dialog for entering an incorrect password when importing an encrypted certificate file.">
+ Incorrect password.
+ </message>
+ <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_CA_IMPORT_ERROR_TITLE" desc="The title in the error dialog for Certification Authority file import errors.">
+ Certification Authority Import Error
+ </message>
+ <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_CERT_PARSE_ERROR" desc="The message in the certificate manager error dialog for importing invalid certificate files.">
+ Unable to parse file.
+ </message>
+ <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_DELETE_CERT_ERROR_TITLE" desc="The title in the error dialog for certificate delete errors.">
+ Certificate Deletion Error
+ </message>
+ <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_ERROR_CERT_ALREADY_EXISTS" desc="The error message when trying to import certificate which already exists.">
+ Certificate already exists.
+ </message>
+ <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_ERROR_NOT_CA" desc="The error message when trying to import certificate authorities and a certificate is not a certification authority">
+ Not a Certification Authority.
+ </message>
+ <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_IMPORT_ALL_NOT_IMPORTED" desc="The header in certificate manager error dialog for list of certificates that could not be imported, when none were successfully imported.">
+ The file contained multiple certificates, none of which were imported:
+ </message>
+ <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_IMPORT_ERROR_TITLE" desc="The title in the error dialog for certificate file import errors.">
+ Certificate Import Error
+ </message>
+ <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_IMPORT_INVALID_FILE" desc="The message in the error dialog for corrupt certificate files.">
+ Invalid or corrupt file.
+ </message>
+ <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_IMPORT_INVALID_MAC" desc="The message in the error dialog for certificate files with invalid MAC.">
+ Incorrect password or corrupt file.
+ </message>
+ <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_IMPORT_MISSING_KEY" desc="The message in the error dialog for certificates without a local private key.">
+ The Private Key for this Client Certificate is missing or invalid.
+ </message>
+ <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_IMPORT_SINGLE_NOT_IMPORTED" desc="The header in certificate manager error dialog for single certificates that could not be imported.">
+ The file contained one certificate, which was not imported:
+ </message>
+ <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_IMPORT_SOME_NOT_IMPORTED" desc="The header in certificate manager error dialog for list of certificates that could not be imported, even though others were.">
+ The file contained multiple certificates, some of which were not imported:
+ </message>
+ <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_IMPORT_UNSUPPORTED" desc="The message in the error dialog for unsupported certificate files.">
+ File uses unsupported features.
+ </message>
+ <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_PKCS12_EXPORT_ERROR_TITLE" desc="The title in the error dialog for PKCS #12 file export errors.">
+ PKCS #12 Export Error
+ </message>
+ <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_PKCS12_FILES" desc="The label in the file selector dialog for PKCS #12 file type.">
+ PKCS #12 Files
+ </message>
+ <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_READ_ERROR_FORMAT" desc="The text in the error dialog for certificate file read errors.">
+ There was an error while trying to read the file: <ph name="ERROR_TEXT">$1<ex>File not found.</ex></ph>.
+ </message>
+ <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_IMPORT_ERROR_FORMAT" desc="The format of per-certificate error messages in import failure dialog">
+ <ph name="CERTIFICATE_NAME">$1<ex>www.example.com</ex></ph>: <ph name="ERROR">$2<ex>Not a Certification Authority</ex></ph>
+ </message>
+ <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_SERVER_IMPORT_ERROR_TITLE" desc="The title in the error dialog for Certification Authority file import errors.">
+ Server Certificate Import Error
+ </message>
+ <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_SET_TRUST_ERROR_TITLE" desc="The title in the error dialog for certificate trust editing errors.">
+ Error Setting Certificate Trust
+ </message>
+ <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_UNKNOWN_ERROR" desc="The text in the error dialog when an unknown error occurs during an operation on the certificate database.">
+ Unknown error.
+ </message>
+ <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_WRITE_ERROR_FORMAT" desc="The text in the error dialog for PKCS #12 file write errors.">
+ There was an error while trying to write the file: <ph name="ERROR_TEXT">$1<ex>Permission denied.</ex></ph>.
+ </message>
+ </if>
<!-- Clear Browsing Data -->
<message name="IDS_SETTINGS_CLEAR_FOLLOWING_ITEMS_FROM" desc="Label at the top of the client area of the dialog, preceding the period combo box">
diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.html b/chrome/browser/resources/settings/privacy_page/privacy_page.html
index 0e2a19d..7a48676 100644
--- a/chrome/browser/resources/settings/privacy_page/privacy_page.html
+++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html
@@ -2,7 +2,9 @@
<link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classes/iron-flex-layout.html">
<link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-animatable.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-button.html">
+<if expr="use_nss_certs">
<link rel="import" href="chrome://md-settings/certificate_manager_page/certificate_manager_page.html">
+</if>
<link rel="import" href="chrome://md-settings/clear_browsing_data_dialog/clear_browsing_data_dialog.html">
<link rel="import" href="chrome://md-settings/controls/settings_checkbox.html">
<link rel="import" href="chrome://md-settings/settings_page/settings_animated_pages.html">
@@ -95,12 +97,14 @@
</paper-button>
</div>
</neon-animatable>
+<if expr="use_nss_certs">
<neon-animatable id="manage-certificates">
<settings-subheader i18n-values="page-title:manageCertificates">
</settings-subheader>
<settings-certificate-manager-page>
</settings-certificate-manager-page>
</neon-animatable>
+</if>
<neon-animatable id="site-settings">
<settings-subheader i18n-values="page-title:siteSettings">
</settings-subheader>
diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.js b/chrome/browser/resources/settings/privacy_page/privacy_page.js
index c45ff8b..5ff11f5 100644
--- a/chrome/browser/resources/settings/privacy_page/privacy_page.js
+++ b/chrome/browser/resources/settings/privacy_page/privacy_page.js
@@ -42,7 +42,12 @@ Polymer({
/** @private */
onManageCertificatesTap_: function() {
+<if expr="use_nss_certs">
this.$.pages.setSubpageChain(['manage-certificates']);
+</if>
+<if expr="not use_nss_certs">
+ // TODO(dpapad): Launch native certificate manager here.
+</if>
},
/** @private */
diff --git a/chrome/browser/resources/settings/settings_resources.grd b/chrome/browser/resources/settings/settings_resources.grd
index a1b0c03..c0eba2d 100644
--- a/chrome/browser/resources/settings/settings_resources.grd
+++ b/chrome/browser/resources/settings/settings_resources.grd
@@ -161,51 +161,53 @@
<structure name="IDR_SETTINGS_CR_SETTINGS_UI_JS"
file="settings_ui/settings_ui.js"
type="chrome_html" />
- <structure name="IDR_SETTINGS_CERTIFICATE_MANAGER_PAGE_CSS"
- file="certificate_manager_page/certificate_manager_page.css"
- type="chrome_html" />
- <structure name="IDR_SETTINGS_CERTIFICATE_MANAGER_PAGE_HTML"
- file="certificate_manager_page/certificate_manager_page.html"
- type="chrome_html" />
- <structure name="IDR_SETTINGS_CERTIFICATE_MANAGER_PAGE_JS"
- file="certificate_manager_page/certificate_manager_page.js"
- type="chrome_html" />
- <structure name="IDR_SETTINGS_CERTIFICATES_BROWSER_PROXY_HTML"
- file="certificate_manager_page/certificates_browser_proxy.html"
- type="chrome_html" />
- <structure name="IDR_SETTINGS_CERTIFICATES_BROWSER_PROXY_JS"
- file="certificate_manager_page/certificates_browser_proxy.js"
- type="chrome_html" />
- <structure name="IDR_SETTINGS_CA_TRUST_EDIT_DIALOG_JS"
- file="certificate_manager_page/ca_trust_edit_dialog.js"
- type="chrome_html" />
- <structure name="IDR_SETTINGS_CA_TRUST_EDIT_DIALOG_HTML"
- file="certificate_manager_page/ca_trust_edit_dialog.html"
- type="chrome_html" />
- <structure name="IDR_SETTINGS_CERTIFICATE_DELETE_CONFIRMATION_DIALOG_JS"
- file="certificate_manager_page/certificate_delete_confirmation_dialog.js"
- type="chrome_html" />
- <structure name="IDR_SETTINGS_CERTIFICATE_DELETE_CONFIRMATION_DIALOG_HTML"
- file="certificate_manager_page/certificate_delete_confirmation_dialog.html"
- type="chrome_html" />
- <structure name="IDR_SETTINGS_CERTIFICATE_PASSWORD_ENCRYPTION_DIALOG_JS"
- file="certificate_manager_page/certificate_password_encryption_dialog.js"
- type="chrome_html" />
- <structure name="IDR_SETTINGS_CERTIFICATE_PASSWORD_ENCRYPTION_DIALOG_HTML"
- file="certificate_manager_page/certificate_password_encryption_dialog.html"
- type="chrome_html" />
- <structure name="IDR_SETTINGS_CERTIFICATE_PASSWORD_DECRYPTION_DIALOG_JS"
- file="certificate_manager_page/certificate_password_decryption_dialog.js"
- type="chrome_html" />
- <structure name="IDR_SETTINGS_CERTIFICATE_PASSWORD_DECRYPTION_DIALOG_HTML"
- file="certificate_manager_page/certificate_password_decryption_dialog.html"
- type="chrome_html" />
- <structure name="IDR_SETTINGS_CERTIFICATES_ERROR_DIALOG_JS"
- file="certificate_manager_page/certificates_error_dialog.js"
- type="chrome_html" />
- <structure name="IDR_SETTINGS_CERTIFICATES_ERROR_DIALOG_HTML"
- file="certificate_manager_page/certificates_error_dialog.html"
- type="chrome_html" />
+ <if expr="use_nss_certs">
+ <structure name="IDR_SETTINGS_CERTIFICATE_MANAGER_PAGE_CSS"
+ file="certificate_manager_page/certificate_manager_page.css"
+ type="chrome_html" />
+ <structure name="IDR_SETTINGS_CERTIFICATE_MANAGER_PAGE_HTML"
+ file="certificate_manager_page/certificate_manager_page.html"
+ type="chrome_html" />
+ <structure name="IDR_SETTINGS_CERTIFICATE_MANAGER_PAGE_JS"
+ file="certificate_manager_page/certificate_manager_page.js"
+ type="chrome_html" />
+ <structure name="IDR_SETTINGS_CERTIFICATES_BROWSER_PROXY_HTML"
+ file="certificate_manager_page/certificates_browser_proxy.html"
+ type="chrome_html" />
+ <structure name="IDR_SETTINGS_CERTIFICATES_BROWSER_PROXY_JS"
+ file="certificate_manager_page/certificates_browser_proxy.js"
+ type="chrome_html" />
+ <structure name="IDR_SETTINGS_CA_TRUST_EDIT_DIALOG_JS"
+ file="certificate_manager_page/ca_trust_edit_dialog.js"
+ type="chrome_html" />
+ <structure name="IDR_SETTINGS_CA_TRUST_EDIT_DIALOG_HTML"
+ file="certificate_manager_page/ca_trust_edit_dialog.html"
+ type="chrome_html" />
+ <structure name="IDR_SETTINGS_CERTIFICATE_DELETE_CONFIRMATION_DIALOG_JS"
+ file="certificate_manager_page/certificate_delete_confirmation_dialog.js"
+ type="chrome_html" />
+ <structure name="IDR_SETTINGS_CERTIFICATE_DELETE_CONFIRMATION_DIALOG_HTML"
+ file="certificate_manager_page/certificate_delete_confirmation_dialog.html"
+ type="chrome_html" />
+ <structure name="IDR_SETTINGS_CERTIFICATE_PASSWORD_ENCRYPTION_DIALOG_JS"
+ file="certificate_manager_page/certificate_password_encryption_dialog.js"
+ type="chrome_html" />
+ <structure name="IDR_SETTINGS_CERTIFICATE_PASSWORD_ENCRYPTION_DIALOG_HTML"
+ file="certificate_manager_page/certificate_password_encryption_dialog.html"
+ type="chrome_html" />
+ <structure name="IDR_SETTINGS_CERTIFICATE_PASSWORD_DECRYPTION_DIALOG_JS"
+ file="certificate_manager_page/certificate_password_decryption_dialog.js"
+ type="chrome_html" />
+ <structure name="IDR_SETTINGS_CERTIFICATE_PASSWORD_DECRYPTION_DIALOG_HTML"
+ file="certificate_manager_page/certificate_password_decryption_dialog.html"
+ type="chrome_html" />
+ <structure name="IDR_SETTINGS_CERTIFICATES_ERROR_DIALOG_JS"
+ file="certificate_manager_page/certificates_error_dialog.js"
+ type="chrome_html" />
+ <structure name="IDR_SETTINGS_CERTIFICATES_ERROR_DIALOG_HTML"
+ file="certificate_manager_page/certificates_error_dialog.html"
+ type="chrome_html" />
+ </if>
<structure name="IDR_SETTINGS_CLEAR_BROWSING_DATA_DIALOG_HTML"
file="clear_browsing_data_dialog/clear_browsing_data_dialog.html"
type="chrome_html" />
@@ -463,6 +465,7 @@
allowexternalscript="true" />
<structure name="IDR_SETTINGS_PRIVACY_PAGE_JS"
file="privacy_page/privacy_page.js"
+ flattenhtml="true"
type="chrome_html" />
<structure name="IDR_SETTINGS_CR_SETTINGS_ROUTER_HTML"
file="settings_page/settings_router.html"
diff --git a/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
index e39adbd..34ad2a75 100644
--- a/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
+++ b/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
@@ -197,6 +197,7 @@ void AddBluetoothStrings(content::WebUIDataSource* html_source) {
}
#endif
+#if defined(USE_NSS_CERTS)
void AddCertificateManagerStrings(content::WebUIDataSource* html_source) {
LocalizedString localized_strings[] = {
{"certificateManagerPageTitle", IDS_SETTINGS_CERTIFICATE_MANAGER},
@@ -266,6 +267,7 @@ void AddCertificateManagerStrings(content::WebUIDataSource* html_source) {
AddLocalizedStringsBulk(html_source, localized_strings,
arraysize(localized_strings));
}
+#endif
void AddClearBrowsingDataStrings(content::WebUIDataSource* html_source) {
LocalizedString localized_strings[] = {
@@ -866,7 +868,9 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source,
#if defined(OS_CHROMEOS)
AddBluetoothStrings(html_source);
#endif
+#if defined(USE_NSS_CERTS)
AddCertificateManagerStrings(html_source);
+#endif
AddClearBrowsingDataStrings(html_source);
AddCloudPrintStrings(html_source);
#if !defined(OS_CHROMEOS)
diff --git a/chrome/test/data/webui/settings/cr_settings_browsertest.js b/chrome/test/data/webui/settings/cr_settings_browsertest.js
index 52287e8..b176c5f 100644
--- a/chrome/test/data/webui/settings/cr_settings_browsertest.js
+++ b/chrome/test/data/webui/settings/cr_settings_browsertest.js
@@ -127,6 +127,7 @@ TEST_F('CrSettingsSearchEnginesTest', 'SearchEngines', function() {
mocha.run();
});
+GEN('#if defined(USE_NSS_CERTS)');
/**
* Test fixture for chrome/browser/resources/settings/certificate_manager_page/.
* @constructor
@@ -153,6 +154,7 @@ TEST_F('CrSettingsCertificateManagerTest', 'CertificateManager', function() {
certificate_manager_page.registerTests();
mocha.run();
});
+GEN('#endif');
/**
* Test fixture for chrome/browser/resources/settings/site_settings/.