OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/chromeos/options/cert_library.h" | 5 #include "chrome/browser/chromeos/options/cert_library.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/i18n/string_compare.h" | 10 #include "base/i18n/string_compare.h" |
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
131 | 131 |
132 void CertLibrary::AddObserver(CertLibrary::Observer* observer) { | 132 void CertLibrary::AddObserver(CertLibrary::Observer* observer) { |
133 observer_list_.AddObserver(observer); | 133 observer_list_.AddObserver(observer); |
134 } | 134 } |
135 | 135 |
136 void CertLibrary::RemoveObserver(CertLibrary::Observer* observer) { | 136 void CertLibrary::RemoveObserver(CertLibrary::Observer* observer) { |
137 observer_list_.RemoveObserver(observer); | 137 observer_list_.RemoveObserver(observer); |
138 } | 138 } |
139 | 139 |
140 bool CertLibrary::CertificatesLoading() const { | 140 bool CertLibrary::CertificatesLoading() const { |
141 return CertLoader::Get()->CertificatesLoading(); | 141 return CertLoader::Get()->initial_load_of_any_database_running(); |
142 } | 142 } |
143 | 143 |
144 bool CertLibrary::CertificatesLoaded() const { | 144 bool CertLibrary::CertificatesLoaded() const { |
145 return CertLoader::Get()->certificates_loaded(); | 145 return CertLoader::Get()->initial_load_finished(); |
146 } | 146 } |
147 | 147 |
148 int CertLibrary::NumCertificates(CertType type) const { | 148 int CertLibrary::NumCertificates(CertType type) const { |
149 const net::CertificateList& cert_list = GetCertificateListForType(type); | 149 const net::CertificateList& cert_list = GetCertificateListForType(type); |
150 return static_cast<int>(cert_list.size()); | 150 return static_cast<int>(cert_list.size()); |
151 } | 151 } |
152 | 152 |
153 base::string16 CertLibrary::GetCertDisplayStringAt(CertType type, | 153 base::string16 CertLibrary::GetCertDisplayStringAt(CertType type, |
154 int index) const { | 154 int index) const { |
155 net::X509Certificate* cert = GetCertificateAt(type, index); | 155 net::X509Certificate* cert = GetCertificateAt(type, index); |
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
268 return user_certs_; | 268 return user_certs_; |
269 if (type == CERT_TYPE_SERVER) | 269 if (type == CERT_TYPE_SERVER) |
270 return server_certs_; | 270 return server_certs_; |
271 if (type == CERT_TYPE_SERVER_CA) | 271 if (type == CERT_TYPE_SERVER_CA) |
272 return server_ca_certs_; | 272 return server_ca_certs_; |
273 DCHECK(type == CERT_TYPE_DEFAULT); | 273 DCHECK(type == CERT_TYPE_DEFAULT); |
274 return certs_; | 274 return certs_; |
275 } | 275 } |
276 | 276 |
277 } // namespace chromeos | 277 } // namespace chromeos |
OLD | NEW |