summaryrefslogtreecommitdiffstats
path: root/chrome/browser/resources
diff options
context:
space:
mode:
authormattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-13 01:21:13 +0000
committermattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-13 01:21:13 +0000
commit7a3a965742838666dbfb3665783d08f3976f1d6c (patch)
tree31380e6ab890536b8cfc186772c974b62e88c012 /chrome/browser/resources
parent8d260e51fdb7b92eae3dc4a1800dc571711c9277 (diff)
downloadchromium_src-7a3a965742838666dbfb3665783d08f3976f1d6c.zip
chromium_src-7a3a965742838666dbfb3665783d08f3976f1d6c.tar.gz
chromium_src-7a3a965742838666dbfb3665783d08f3976f1d6c.tar.bz2
DOMUI Cert Manager: Add import server cert function.
BUG=19991 TEST=manual Review URL: http://codereview.chromium.org/3691008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62368 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/resources')
-rw-r--r--chrome/browser/resources/options/certificate_manager.html2
-rw-r--r--chrome/browser/resources/options/certificate_manager.js4
2 files changed, 5 insertions, 1 deletions
diff --git a/chrome/browser/resources/options/certificate_manager.html b/chrome/browser/resources/options/certificate_manager.html
index 2a5623d..496d6d2 100644
--- a/chrome/browser/resources/options/certificate_manager.html
+++ b/chrome/browser/resources/options/certificate_manager.html
@@ -88,9 +88,9 @@
<!-- TODO(mattm):
<button id="serverCertsTab-edit" i18n-content="edit_certificate"
disabled></button>
+ -->
<button id="serverCertsTab-import" i18n-content="import_certificate"
></button>
- -->
<button id="serverCertsTab-export" i18n-content="export_certificate"
disabled></button>
<button id="serverCertsTab-delete" i18n-content="delete_certificate"
diff --git a/chrome/browser/resources/options/certificate_manager.js b/chrome/browser/resources/options/certificate_manager.js
index 062fb56..5295bde 100644
--- a/chrome/browser/resources/options/certificate_manager.js
+++ b/chrome/browser/resources/options/certificate_manager.js
@@ -66,6 +66,10 @@ cr.define('options', function() {
this.importButton.onclick = function(e) {
chrome.send('importPersonalCertificate', []);
}
+ } else if (id == 'serverCertsTab') {
+ this.importButton.onclick = function(e) {
+ chrome.send('importServerCertificate', []);
+ }
} else if (id == 'caCertsTab') {
this.importButton.onclick = function(e) {
chrome.send('importCaCertificate', []);