| OLD | NEW | 
|    1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |    1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 
|    2 // Use of this source code is governed by a BSD-style license that can be |    2 // Use of this source code is governed by a BSD-style license that can be | 
|    3 // found in the LICENSE file. |    3 // found in the LICENSE file. | 
|    4  |    4  | 
|    5 cr.define('options', function() { |    5 cr.define('options', function() { | 
|    6  |    6  | 
|    7   var OptionsPage = options.OptionsPage; |    7   var OptionsPage = options.OptionsPage; | 
|    8  |    8  | 
|    9   ///////////////////////////////////////////////////////////////////////////// |    9   ///////////////////////////////////////////////////////////////////////////// | 
|   10   // CertificateManagerTab class: |   10   // CertificateManagerTab class: | 
|   11  |   11  | 
| (...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  136      * @param {!Event} e The change event object. |  136      * @param {!Event} e The change event object. | 
|  137      */ |  137      */ | 
|  138     handleCertificatesTreeChange_: function(e) { |  138     handleCertificatesTreeChange_: function(e) { | 
|  139       var data = null; |  139       var data = null; | 
|  140       if (this.tree.selectedItem) { |  140       if (this.tree.selectedItem) { | 
|  141         data = this.tree.selectedItem.data; |  141         data = this.tree.selectedItem.data; | 
|  142       } |  142       } | 
|  143  |  143  | 
|  144       this.updateButtonState(data); |  144       this.updateButtonState(data); | 
|  145     }, |  145     }, | 
|  146  |  146   }; | 
|  147   } |  | 
|  148  |  147  | 
|  149   // TODO(xiyuan): Use notification from backend instead of polling. |  148   // TODO(xiyuan): Use notification from backend instead of polling. | 
|  150   // TPM token check polling timer. |  149   // TPM token check polling timer. | 
|  151   var tpmPollingTimer; |  150   var tpmPollingTimer; | 
|  152  |  151  | 
|  153   // Initiate tpm token check if needed. |  152   // Initiate tpm token check if needed. | 
|  154   function checkTpmToken() { |  153   function checkTpmToken() { | 
|  155     var importAndBindButton = $('personalCertsTab-import-and-bind'); |  154     var importAndBindButton = $('personalCertsTab-import-and-bind'); | 
|  156  |  155  | 
|  157     if (importAndBindButton && importAndBindButton.disabled) |  156     if (importAndBindButton && importAndBindButton.disabled) | 
| (...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  244     } |  243     } | 
|  245   }; |  244   }; | 
|  246  |  245  | 
|  247   // Export |  246   // Export | 
|  248   return { |  247   return { | 
|  249     CertificateManagerTab: CertificateManagerTab, |  248     CertificateManagerTab: CertificateManagerTab, | 
|  250     CertificateManager: CertificateManager |  249     CertificateManager: CertificateManager | 
|  251   }; |  250   }; | 
|  252  |  251  | 
|  253 }); |  252 }); | 
| OLD | NEW |