| 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 "chromeos/network/client_cert_resolver.h" | 5 #include "chromeos/network/client_cert_resolver.h" |
| 6 | 6 |
| 7 #include <cert.h> | 7 #include <cert.h> |
| 8 #include <certt.h> // for (SECCertUsageEnum) certUsageAnyCA | 8 #include <certt.h> // for (SECCertUsageEnum) certUsageAnyCA |
| 9 #include <pk11pub.h> | 9 #include <pk11pub.h> |
| 10 | 10 |
| 11 #include <algorithm> | 11 #include <algorithm> |
| 12 #include <string> | |
| 13 | 12 |
| 14 #include "base/bind.h" | 13 #include "base/bind.h" |
| 15 #include "base/location.h" | 14 #include "base/location.h" |
| 16 #include "base/logging.h" | 15 #include "base/logging.h" |
| 17 #include "base/stl_util.h" | 16 #include "base/stl_util.h" |
| 18 #include "base/task_runner.h" | 17 #include "base/task_runner.h" |
| 19 #include "base/threading/worker_pool.h" | 18 #include "base/threading/worker_pool.h" |
| 20 #include "chromeos/cert_loader.h" | |
| 21 #include "chromeos/dbus/dbus_thread_manager.h" | 19 #include "chromeos/dbus/dbus_thread_manager.h" |
| 22 #include "chromeos/dbus/shill_service_client.h" | 20 #include "chromeos/dbus/shill_service_client.h" |
| 23 #include "chromeos/network/managed_network_configuration_handler.h" | 21 #include "chromeos/network/managed_network_configuration_handler.h" |
| 24 #include "chromeos/network/network_state.h" | 22 #include "chromeos/network/network_state.h" |
| 25 #include "components/onc/onc_constants.h" | 23 #include "components/onc/onc_constants.h" |
| 26 #include "dbus/object_path.h" | 24 #include "dbus/object_path.h" |
| 27 #include "net/cert/scoped_nss_types.h" | 25 #include "net/cert/scoped_nss_types.h" |
| 28 #include "net/cert/x509_certificate.h" | 26 #include "net/cert/x509_certificate.h" |
| 29 | 27 |
| 30 namespace chromeos { | 28 namespace chromeos { |
| (...skipping 469 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 500 void ClientCertResolver::NotifyResolveRequestCompleted() { | 498 void ClientCertResolver::NotifyResolveRequestCompleted() { |
| 501 VLOG(2) << "Notify observers: " << (network_properties_changed_ ? "" : "no ") | 499 VLOG(2) << "Notify observers: " << (network_properties_changed_ ? "" : "no ") |
| 502 << "networks changed."; | 500 << "networks changed."; |
| 503 resolve_task_running_ = false; | 501 resolve_task_running_ = false; |
| 504 const bool changed = network_properties_changed_; | 502 const bool changed = network_properties_changed_; |
| 505 network_properties_changed_ = false; | 503 network_properties_changed_ = false; |
| 506 FOR_EACH_OBSERVER(Observer, observers_, ResolveRequestCompleted(changed)); | 504 FOR_EACH_OBSERVER(Observer, observers_, ResolveRequestCompleted(changed)); |
| 507 } | 505 } |
| 508 | 506 |
| 509 } // namespace chromeos | 507 } // namespace chromeos |
| OLD | NEW |