Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(41)

Unified Diff: chrome/browser/resources/settings/certificate_manager_page/certificate_manager_page.js

Issue 1863733003: MD Settings: Certificate manager, implement importing CA certificate. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove hasOwnProperty. Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/resources/settings/certificate_manager_page/certificate_manager_page.js
diff --git a/chrome/browser/resources/settings/certificate_manager_page/certificate_manager_page.js b/chrome/browser/resources/settings/certificate_manager_page/certificate_manager_page.js
index 1ab76964abd2e697b42c894479f9758527a3c4b0..cc468ef480e3dc0b78c612505a6244cb4da092aa 100644
--- a/chrome/browser/resources/settings/certificate_manager_page/certificate_manager_page.js
+++ b/chrome/browser/resources/settings/certificate_manager_page/certificate_manager_page.js
@@ -103,15 +103,23 @@ Polymer({
/** @override */
ready: function() {
this.addEventListener(settings.CertificateActionEvent, function(event) {
+ this.dialogModel_ = event.detail.subnode;
+ this.dialogModelCertificateType_ = event.detail.certificateType;
+
if (event.detail.action == settings.CertificateAction.IMPORT) {
- this.handleImportAction_(event.detail);
+ if (event.detail.certificateType == settings.CertificateType.PERSONAL) {
+ this.openDialog_(
+ 'settings-certificate-password-decryption-dialog',
+ 'showPasswordDecryptionDialog_');
+ } else if (event.detail.certificateType ==
+ settings.CertificateType.CA) {
+ this.openDialog_(
+ 'settings-ca-trust-edit-dialog', 'showCaTrustEditDialog_');
+ }
} else {
- this.dialogModel_ = event.detail.subnode;
- this.dialogModelCertificateType_ = event.detail.certificateType;
if (event.detail.action == settings.CertificateAction.EDIT) {
this.openDialog_(
- 'settings-ca-trust-edit-dialog',
- 'showCaTrustEditDialog_');
+ 'settings-ca-trust-edit-dialog', 'showCaTrustEditDialog_');
} else if (event.detail.action == settings.CertificateAction.DELETE) {
this.openDialog_(
'settings-certificate-delete-confirmation-dialog',
@@ -137,22 +145,6 @@ Polymer({
},
/**
- * Handles a |CertificateAction.IMPORT| for cases where a dialog needs to be
- * displayed to the user.
- * @param {!CertificateActionEventDetail} eventdetail
- * @private
- */
- handleImportAction_: function(actionEvent) {
- if (actionEvent.certificateType == settings.CertificateType.PERSONAL) {
- this.openDialog_(
- 'settings-certificate-password-decryption-dialog',
- 'showPasswordDecryptionDialog_');
- } else if (actionEvent.certificateType == settings.CertificateType.CA) {
- // TODO(dpapad): Implement this.
- }
- },
-
- /**
* Opens a dialog and registers a listener for removing the dialog from the
* DOM once is closed. The listener is destroyed when the dialog is removed
* (because of 'restamp').

Powered by Google App Engine
This is Rietveld 408576698