OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/certificate_provider/certificate_provider_serv
ice.h" | 5 #include "chrome/browser/chromeos/certificate_provider/certificate_provider_serv
ice.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <utility> | 9 #include <utility> |
10 | 10 |
(...skipping 382 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
393 base::Callback<void(const net::CertificateList&)> callback; | 393 base::Callback<void(const net::CertificateList&)> callback; |
394 certificate_requests_.RemoveRequest(cert_request_id, &certificates, | 394 certificate_requests_.RemoveRequest(cert_request_id, &certificates, |
395 &callback); | 395 &callback); |
396 UpdateCertificatesAndRun(certificates, callback); | 396 UpdateCertificatesAndRun(certificates, callback); |
397 } | 397 } |
398 | 398 |
399 certificate_map_.RemoveExtension(extension_id); | 399 certificate_map_.RemoveExtension(extension_id); |
400 | 400 |
401 for (auto callback : sign_requests_.RemoveAllRequests(extension_id)) | 401 for (auto callback : sign_requests_.RemoveAllRequests(extension_id)) |
402 callback.Run(net::ERR_FAILED, std::vector<uint8_t>()); | 402 callback.Run(net::ERR_FAILED, std::vector<uint8_t>()); |
| 403 |
| 404 pin_dialog_manager_.ExtensionUnloaded(extension_id); |
403 } | 405 } |
404 | 406 |
405 void CertificateProviderService::GetCertificatesFromExtensions( | 407 void CertificateProviderService::GetCertificatesFromExtensions( |
406 const base::Callback<void(const net::CertificateList&)>& callback) { | 408 const base::Callback<void(const net::CertificateList&)>& callback) { |
407 DCHECK(thread_checker_.CalledOnValidThread()); | 409 DCHECK(thread_checker_.CalledOnValidThread()); |
408 | 410 |
409 const std::vector<std::string> provider_extensions( | 411 const std::vector<std::string> provider_extensions( |
410 delegate_->CertificateProviderExtensions()); | 412 delegate_->CertificateProviderExtensions()); |
411 | 413 |
412 if (provider_extensions.empty()) { | 414 if (provider_extensions.empty()) { |
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
470 const int sign_request_id = sign_requests_.AddRequest(extension_id, callback); | 472 const int sign_request_id = sign_requests_.AddRequest(extension_id, callback); |
471 if (!delegate_->DispatchSignRequestToExtension(extension_id, sign_request_id, | 473 if (!delegate_->DispatchSignRequestToExtension(extension_id, sign_request_id, |
472 hash, certificate, digest)) { | 474 hash, certificate, digest)) { |
473 sign_requests_.RemoveRequest(extension_id, sign_request_id, | 475 sign_requests_.RemoveRequest(extension_id, sign_request_id, |
474 nullptr /* callback */); | 476 nullptr /* callback */); |
475 callback.Run(net::ERR_FAILED, std::vector<uint8_t>()); | 477 callback.Run(net::ERR_FAILED, std::vector<uint8_t>()); |
476 } | 478 } |
477 } | 479 } |
478 | 480 |
479 } // namespace chromeos | 481 } // namespace chromeos |
OLD | NEW |