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

Unified Diff: chrome/browser/chromeos/cros/cert_library.cc

Issue 14729017: Add NetworkHandler to own network handlers in src/chromeos/network (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix chromeos_unittests Created 7 years, 7 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
Index: chrome/browser/chromeos/cros/cert_library.cc
diff --git a/chrome/browser/chromeos/cros/cert_library.cc b/chrome/browser/chromeos/cros/cert_library.cc
index 86aa9f5aee2eeeec7e65ff97600d2c2fd2592797..6e518fc7cfea8d6c16f2b07202634a5624cb1542 100644
--- a/chrome/browser/chromeos/cros/cert_library.cc
+++ b/chrome/browser/chromeos/cros/cert_library.cc
@@ -111,11 +111,11 @@ bool CertLibrary::IsInitialized() {
}
CertLibrary::CertLibrary() {
- CertLoader::Get()->AddObserver(this);
+ NetworkHandler::Get()->cert_loader()->AddObserver(this);
}
CertLibrary::~CertLibrary() {
- CertLoader::Get()->RemoveObserver(this);
+ NetworkHandler::Get()->cert_loader()->RemoveObserver(this);
}
void CertLibrary::AddObserver(CertLibrary::Observer* observer) {
@@ -127,15 +127,15 @@ void CertLibrary::RemoveObserver(CertLibrary::Observer* observer) {
}
bool CertLibrary::CertificatesLoading() const {
- return CertLoader::Get()->CertificatesLoading();
+ return NetworkHandler::Get()->cert_loader()->CertificatesLoading();
}
bool CertLibrary::CertificatesLoaded() const {
- return CertLoader::Get()->certificates_loaded();
+ return NetworkHandler::Get()->cert_loader()->certificates_loaded();
}
bool CertLibrary::IsHardwareBacked() const {
- return CertLoader::Get()->IsHardwareBacked();
+ return NetworkHandler::Get()->cert_loader()->IsHardwareBacked();
}
int CertLibrary::NumCertificates(CertType type) const {
@@ -160,12 +160,13 @@ std::string CertLibrary::GetCertPkcs11IdAt(CertType type, int index) const {
}
bool CertLibrary::IsCertHardwareBackedAt(CertType type, int index) const {
- if (!CertLoader::Get()->IsHardwareBacked())
+ if (!NetworkHandler::Get()->cert_loader()->IsHardwareBacked())
return false;
net::X509Certificate* cert = GetCertificateAt(type, index);
std::string cert_token_name =
x509_certificate_model::GetTokenName(cert->os_cert_handle());
- return cert_token_name == CertLoader::Get()->tpm_token_name();
+ return cert_token_name ==
+ NetworkHandler::Get()->cert_loader()->tpm_token_name();
}
int CertLibrary::GetCertIndexByNickname(CertType type,
« no previous file with comments | « chrome/browser/chromeos/chrome_browser_main_chromeos.cc ('k') | chrome/browser/chromeos/cros/network_library.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698