| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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: |
| (...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 195 initalized_: false, | 195 initalized_: false, |
| 196 | 196 |
| 197 /** | 197 /** |
| 198 * Handler for OptionsPage's visible property change event. | 198 * Handler for OptionsPage's visible property change event. |
| 199 * @private | 199 * @private |
| 200 * @param {Event} e Property change event. | 200 * @param {Event} e Property change event. |
| 201 */ | 201 */ |
| 202 handleVisibleChange_: function(e) { | 202 handleVisibleChange_: function(e) { |
| 203 if (!this.initalized_ && this.visible) { | 203 if (!this.initalized_ && this.visible) { |
| 204 this.initalized_ = true; | 204 this.initalized_ = true; |
| 205 OptionsPage.showTab($('personal-certs-nav-tab')); |
| 205 chrome.send('populateCertificateManager'); | 206 chrome.send('populateCertificateManager'); |
| 206 } | 207 } |
| 207 | 208 |
| 208 if (cr.isChromeOS) { | 209 if (cr.isChromeOS) { |
| 209 // Ensure TPM token check on visible and stop polling when hidden. | 210 // Ensure TPM token check on visible and stop polling when hidden. |
| 210 if (this.visible) | 211 if (this.visible) |
| 211 checkTpmToken(); | 212 checkTpmToken(); |
| 212 else | 213 else |
| 213 stopTpmTokenCheckPolling(); | 214 stopTpmTokenCheckPolling(); |
| 214 } | 215 } |
| (...skipping 25 matching lines...) Expand all Loading... |
| 240 } | 241 } |
| 241 }; | 242 }; |
| 242 | 243 |
| 243 // Export | 244 // Export |
| 244 return { | 245 return { |
| 245 CertificateManagerTab: CertificateManagerTab, | 246 CertificateManagerTab: CertificateManagerTab, |
| 246 CertificateManager: CertificateManager | 247 CertificateManager: CertificateManager |
| 247 }; | 248 }; |
| 248 | 249 |
| 249 }); | 250 }); |
| OLD | NEW |