Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3609)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/resources/options/certificate_manager.js

Issue 209263002: Merge 257570 "Handle cases when user cert database has NULL slots" (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1847/src/
Patch Set: Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/certificate_manager_model.cc ('k') | chrome/browser/ui/webui/options/certificate_manager_browsertest.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/options/certificate_manager.js
===================================================================
--- chrome/browser/resources/options/certificate_manager.js (revision 258711)
+++ chrome/browser/resources/options/certificate_manager.js (working copy)
@@ -208,8 +208,11 @@
CertificateRestoreOverlay.show();
};
- CertificateManager.onModelReady = function(tpm_available) {
- if (tpm_available)
+ CertificateManager.onModelReady = function(userDbAvailable,
+ tpmAvailable) {
+ if (!userDbAvailable)
+ return;
+ if (tpmAvailable)
$('personalCertsTab-import-and-bind').disabled = false;
$('personalCertsTab-import').disabled = false;
$('serverCertsTab-import').disabled = false;
« no previous file with comments | « chrome/browser/certificate_manager_model.cc ('k') | chrome/browser/ui/webui/options/certificate_manager_browsertest.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698