diff options
| author | pneubeck@chromium.org <pneubeck@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-10 11:08:16 +0000 |
|---|---|---|
| committer | pneubeck@chromium.org <pneubeck@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-10 11:08:16 +0000 |
| commit | 777348cdb442a6c14d597e60a6596d1902882521 (patch) | |
| tree | 542276f7ff5a82701f8c5665402dad691f7a83ff /chrome/browser/chromeos/cros/network_library.cc | |
| parent | 401f9d3dc1ec6a2c9313af34da2cf1753954123c (diff) | |
| download | chromium_src-777348cdb442a6c14d597e60a6596d1902882521.zip chromium_src-777348cdb442a6c14d597e60a6596d1902882521.tar.gz chromium_src-777348cdb442a6c14d597e60a6596d1902882521.tar.bz2 | |
Moving ManagedNetworkConfigurationHandler to chromeos/.
Also moving the dependencies of the handler to chromeos/:
NetworkUIData
from chrome/browser/chromeos/cros/network_ui_data*
to chromeos/network/network_ui_data*
NetworkPropertyUIData
from chrome/browser/chromeos/cros/network_ui_data*
to chrome/browser/chromeos/cros/network_property_ui_data*
CreateNetworkUIData
from chrome/browser/chromeos/net/onc_utils*
to chromeos/network/network_ui_data*
CertificatePattern
from chrome/browser/chromeos/cros/certificate_pattern*
to chromeos/network/certificate_pattern*
Certificate pattern matching (was a member function of CertificatePatern)
from chrome/browser/chromeos/cros/certificate_pattern*
to chrome/browser/chromeos/cros/certificate_pattern_matcher*
The only implementation change is in network_ui_data.cc in order to break dependency on EnumMapper.
NetworkUIData and CertificatePattern are data keeping classes only, and will eventually be replaced by ONC. However, we need them for backwards compatibility for a while.
BUG=180711
Review URL: https://chromiumcodereview.appspot.com/13454006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193364 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/cros/network_library.cc')
| -rw-r--r-- | chrome/browser/chromeos/cros/network_library.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/chromeos/cros/network_library.cc b/chrome/browser/chromeos/cros/network_library.cc index ba3078b..dd6b5d5 100644 --- a/chrome/browser/chromeos/cros/network_library.cc +++ b/chrome/browser/chromeos/cros/network_library.cc @@ -10,13 +10,14 @@ #include "base/json/json_writer.h" // for debug output only. #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversion_utils.h" -#include "chrome/browser/chromeos/cros/certificate_pattern.h" +#include "chrome/browser/chromeos/cros/certificate_pattern_matcher.h" #include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/browser/chromeos/cros/native_network_constants.h" #include "chrome/browser/chromeos/cros/native_network_parser.h" #include "chrome/browser/chromeos/cros/network_library_impl_cros.h" #include "chrome/browser/chromeos/cros/network_library_impl_stub.h" #include "chrome/common/net/x509_certificate_model.h" +#include "chromeos/network/certificate_pattern.h" #include "chromeos/network/cros_network_functions.h" #include "chromeos/network/network_state_handler.h" #include "content/public/browser/browser_thread.h" @@ -778,7 +779,7 @@ void VirtualNetwork::MatchCertificatePattern(bool allow_enroll, } scoped_refptr<net::X509Certificate> matching_cert = - client_cert_pattern().GetMatch(); + GetCertificateMatch(client_cert_pattern()); if (matching_cert.get()) { std::string client_cert_id = x509_certificate_model::GetPkcs11Id(matching_cert->os_cert_handle()); @@ -1300,7 +1301,7 @@ void WifiNetwork::MatchCertificatePattern(bool allow_enroll, } scoped_refptr<net::X509Certificate> matching_cert = - client_cert_pattern().GetMatch(); + GetCertificateMatch(client_cert_pattern()); if (matching_cert.get()) { SetEAPClientCertPkcs11Id( x509_certificate_model::GetPkcs11Id(matching_cert->os_cert_handle())); |