*WIP* Store NSS slots per profile. Move keygen to chrome.

chrome/browser/resources/options/certificate_manager.js

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 cr.define('options', function() {
   var OptionsPage = options.OptionsPage;
 
   /////////////////////////////////////////////////////////////////////////////
   // CertificateManagerTab class:
 
@@ skipping 128 matching lines @@
     handleCertificatesTreeChange_: function(e) {
       var data = null;
       if (this.tree.selectedItem) {
         data = this.tree.selectedItem.data;
       }
 
       this.updateButtonState(data);
     },
   };
 
-  // TODO(xiyuan): Use notification from backend instead of polling.
-  // TPM token check polling timer.
-  var tpmPollingTimer;
-
-  // Initiate tpm token check if needed.
-  function checkTpmToken() {
-    var importAndBindButton = $('personalCertsTab-import-and-bind');
-
-    if (importAndBindButton && importAndBindButton.disabled)
-      chrome.send('checkTpmTokenReady');
-  }
-
-  // Stop tpm polling timer.
-  function stopTpmTokenCheckPolling() {
-    if (tpmPollingTimer) {
-      window.clearTimeout(tpmPollingTimer);
-      tpmPollingTimer = undefined;
-    }
-  }
-
   /////////////////////////////////////////////////////////////////////////////
   // CertificateManager class:
 
   /**
    * Encapsulated handling of ChromeOS accounts options page.
    * @constructor
    */
   function CertificateManager(model) {
     OptionsPage.call(this, 'certificates',
                      loadTimeData.getString('certificateManagerPageTabTitle'),
@@ skipping 26 matching lines @@
      * Handler for OptionsPage's visible property change event.
      * @private
      * @param {Event} e Property change event.
      */
     handleVisibleChange_: function(e) {
       if (!this.initalized_ && this.visible) {
         this.initalized_ = true;
         OptionsPage.showTab($('personal-certs-nav-tab'));
         chrome.send('populateCertificateManager');
       }
-
-      if (cr.isChromeOS) {
-        // Ensure TPM token check on visible and stop polling when hidden.
-        if (this.visible)
-          checkTpmToken();
-        else
-          stopTpmTokenCheckPolling();
-      }
     }
   };
 
   // CertificateManagerHandler callbacks.
   CertificateManager.onPopulateTree = function(args) {
     $(args[0]).populate(args[1]);
   };
 
   CertificateManager.exportPersonalAskPassword = function(args) {
     CertificateBackupOverlay.show();
   };
 
   CertificateManager.importPersonalAskPassword = function(args) {
     CertificateRestoreOverlay.show();
   };
 
-  CertificateManager.onCheckTpmTokenReady = function(ready) {
+  CertificateManager.onModelReady = function() {
     var importAndBindButton = $('personalCertsTab-import-and-bind');
-    if (importAndBindButton) {
-      importAndBindButton.disabled = !ready;
-
-      // Check again after 5 seconds if Tpm is not ready and certificate manager
-      // is still visible.
-      if (!ready && CertificateManager.getInstance().visible)
-        tpmPollingTimer = window.setTimeout(checkTpmToken, 5000);
-    }
+    if (importAndBindButton !== null)
+      importAndBindButton.disabled = false;
+    $('personalCertsTab-import').disabled = false;
+    $('serverCertsTab-import').disabled = false;
+    $('caCertsTab-import').disabled = false;
   };
 
   // Export
   return {
     CertificateManagerTab: CertificateManagerTab,
     CertificateManager: CertificateManager
   };
 });