| OLD | NEW |
| 1 // Copyright (c) 2012 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 #include "chrome/browser/certificate_manager_model.h" | 5 #include "chrome/browser/certificate_manager_model.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/i18n/time_formatting.h" | 8 #include "base/i18n/time_formatting.h" |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
| 11 #include "chrome/browser/net/nss_context.h" | 11 #include "chrome/browser/net/nss_context.h" |
| 12 #include "chrome/browser/ui/crypto_module_password_dialog_nss.h" | 12 #include "chrome/browser/ui/crypto_module_password_dialog_nss.h" |
| 13 #include "chrome/common/net/x509_certificate_model.h" | 13 #include "chrome/common/net/x509_certificate_model.h" |
| 14 #include "chrome/grit/generated_resources.h" |
| 14 #include "content/public/browser/browser_context.h" | 15 #include "content/public/browser/browser_context.h" |
| 15 #include "content/public/browser/browser_thread.h" | 16 #include "content/public/browser/browser_thread.h" |
| 16 #include "content/public/browser/resource_context.h" | 17 #include "content/public/browser/resource_context.h" |
| 17 #include "crypto/nss_util.h" | 18 #include "crypto/nss_util.h" |
| 18 #include "grit/generated_resources.h" | |
| 19 #include "net/base/crypto_module.h" | 19 #include "net/base/crypto_module.h" |
| 20 #include "net/base/net_errors.h" | 20 #include "net/base/net_errors.h" |
| 21 #include "net/cert/x509_certificate.h" | 21 #include "net/cert/x509_certificate.h" |
| 22 #include "ui/base/l10n/l10n_util.h" | 22 #include "ui/base/l10n/l10n_util.h" |
| 23 | 23 |
| 24 using content::BrowserThread; | 24 using content::BrowserThread; |
| 25 | 25 |
| 26 // CertificateManagerModel is created on the UI thread. It needs a | 26 // CertificateManagerModel is created on the UI thread. It needs a |
| 27 // NSSCertDatabase handle (and on ChromeOS it needs to get the TPM status) which | 27 // NSSCertDatabase handle (and on ChromeOS it needs to get the TPM status) which |
| 28 // needs to be done on the IO thread. | 28 // needs to be done on the IO thread. |
| (...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 250 const CreationCallback& callback) { | 250 const CreationCallback& callback) { |
| 251 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 251 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
| 252 net::NSSCertDatabase* cert_db = GetNSSCertDatabaseForResourceContext( | 252 net::NSSCertDatabase* cert_db = GetNSSCertDatabaseForResourceContext( |
| 253 context, | 253 context, |
| 254 base::Bind(&CertificateManagerModel::DidGetCertDBOnIOThread, | 254 base::Bind(&CertificateManagerModel::DidGetCertDBOnIOThread, |
| 255 observer, | 255 observer, |
| 256 callback)); | 256 callback)); |
| 257 if (cert_db) | 257 if (cert_db) |
| 258 DidGetCertDBOnIOThread(observer, callback, cert_db); | 258 DidGetCertDBOnIOThread(observer, callback, cert_db); |
| 259 } | 259 } |
| OLD | NEW |