Merge Chromium at r65505: Initial merge by git.

Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45

1 files changed, 2 insertions, 2 deletions

diff --git a/chrome/browser/resources/options/certificate_manager.js b/chrome/browser/resources/options/certificate_manager.js
index 5295bde..145cfcb 100644
--- a/chrome/browser/resources/options/certificate_manager.js
+++ b/chrome/browser/resources/options/certificate_manager.js
@@ -109,6 +109,7 @@ cr.define('options', function() {
      */
     updateButtonState: function(data) {
       var isCert = !!data && data.id.substr(0, 5) == 'cert-';
+      var readOnly = !!data && data.readonly;
       var hasChildren = this.tree.items.length > 0;
       this.viewButton.disabled = !isCert;
       if (this.editButton !== null)
@@ -119,7 +120,7 @@ cr.define('options', function() {
         this.backupAllButton.disabled = !hasChildren;
       if (this.exportButton !== null)
         this.exportButton.disabled = !isCert;
-      this.deleteButton.disabled = !isCert;
+      this.deleteButton.disabled = !isCert || readOnly;
     },
 
     /**
@@ -160,7 +161,6 @@ cr.define('options', function() {
       OptionsPage.prototype.initializePage.call(this);
 
       this.personalTab = new CertificateManagerTab('personalCertsTab');
-      this.emailTab = new CertificateManagerTab('emailCertsTab');
       this.serverTab = new CertificateManagerTab('serverCertsTab');
       this.caTab = new CertificateManagerTab('caCertsTab');
       this.otherTab = new CertificateManagerTab('otherCertsTab');