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

Unified Diff: chrome/browser/resources/settings/certificate_manager_page/certificate_list.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_list.js
diff --git a/chrome/browser/resources/settings/certificate_manager_page/certificate_list.js b/chrome/browser/resources/settings/certificate_manager_page/certificate_list.js
index 94721d3df5690b7194a086100789a7e2f52f6b0e..59d1699716349c8003bc83fec099fa9d425fe83c 100644
--- a/chrome/browser/resources/settings/certificate_manager_page/certificate_list.js
+++ b/chrome/browser/resources/settings/certificate_manager_page/certificate_list.js
@@ -67,13 +67,16 @@ Polymer({
},
- /** @private */
- dispatchImportActionEvent_: function() {
+ /**
+ * @param {?NewCertificateSubNode} subnode
+ * @private
+ */
+ dispatchImportActionEvent_: function(subnode) {
this.fire(
settings.CertificateActionEvent,
/** @type {!CertificateActionEventDetail} */ ({
action: settings.CertificateAction.IMPORT,
- subnode: null,
+ subnode: subnode,
certificateType: this.certificateType,
}));
},
@@ -85,13 +88,13 @@ Polymer({
browserProxy.importPersonalCertificate(false).then(
function(showPasswordPrompt) {
if (showPasswordPrompt)
- this.dispatchImportActionEvent_();
+ this.dispatchImportActionEvent_(null);
}.bind(this),
this.onRejected_.bind(this));
} else if (this.certificateType == settings.CertificateType.CA) {
browserProxy.importCaCertificate().then(
function(certificateName) {
- this.dispatchImportActionEvent_();
+ this.dispatchImportActionEvent_({name: certificateName});
}.bind(this),
this.onRejected_.bind(this));
} else if (this.certificateType == settings.CertificateType.SERVER) {

Powered by Google App Engine
This is Rietveld 408576698