chrome/browser/chromeos/cros/onc_network_parser.cc - Issue 11299236: This moves the ONC parsing code into chromeos/network/onc

Side by Side Diff: chrome/browser/chromeos/cros/onc_network_parser.cc

Issue 11299236: This moves the ONC parsing code into chromeos/network/onc (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years 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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « chrome/browser/chromeos/cros/onc_constants.cc ('k') | chrome/browser/chromeos/network_settings/onc_mapper.h » ('j') | chromeos/network/onc_mapper.h » ('J')

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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/cros/onc_network_parser.h"	5 #include "chrome/browser/chromeos/cros/onc_network_parser.h"

6	6

7 #include <keyhi.h>	7 #include <keyhi.h>

8 #include <pk11pub.h>	8 #include <pk11pub.h>

9	9

10 #include "base/base64.h"	10 #include "base/base64.h"

11 #include "base/json/json_string_value_serializer.h"	11 #include "base/json/json_string_value_serializer.h"

12 #include "chrome/browser/chromeos/login/user_manager.h"

13 #include "base/json/json_writer.h" // for debug output only.	12 #include "base/json/json_writer.h" // for debug output only.

14 #include "base/stringprintf.h"	13 #include "base/stringprintf.h"

15 #include "base/values.h"	14 #include "base/values.h"

16 #include "chrome/browser/chromeos/cros/certificate_pattern.h"	15 #include "chrome/browser/chromeos/cros/certificate_pattern.h"

17 #include "chrome/browser/chromeos/cros/cros_library.h"	16 #include "chrome/browser/chromeos/cros/cros_library.h"

18 #include "chrome/browser/chromeos/cros/native_network_constants.h"	17 #include "chrome/browser/chromeos/cros/native_network_constants.h"

19 #include "chrome/browser/chromeos/cros/native_network_parser.h"	18 #include "chrome/browser/chromeos/cros/native_network_parser.h"

20 #include "chrome/browser/chromeos/cros/network_library.h"	19 #include "chrome/browser/chromeos/cros/network_library.h"

21 #include "chrome/browser/chromeos/cros/onc_constants.h"	20 #include "chrome/browser/chromeos/login/user_manager.h"

22 #include "chrome/browser/chromeos/network_settings/onc_signature.h"

23 #include "chrome/browser/chromeos/network_settings/onc_validator.h"

24 #include "chrome/browser/chromeos/proxy_config_service_impl.h"	21 #include "chrome/browser/chromeos/proxy_config_service_impl.h"

25 #include "chrome/browser/prefs/proxy_config_dictionary.h"	22 #include "chrome/browser/prefs/proxy_config_dictionary.h"

26 #include "chrome/common/net/x509_certificate_model.h"	23 #include "chrome/common/net/x509_certificate_model.h"

	24 #include "chromeos/network/onc_constants.h"

	25 #include "chromeos/network/onc_signature.h"

	26 #include "chromeos/network/onc_validator.h"

27 #include "content/public/browser/browser_thread.h"	27 #include "content/public/browser/browser_thread.h"

28 #include "crypto/encryptor.h"	28 #include "crypto/encryptor.h"

29 #include "crypto/hmac.h"	29 #include "crypto/hmac.h"

30 #include "crypto/scoped_nss_types.h"	30 #include "crypto/scoped_nss_types.h"

31 #include "crypto/symmetric_key.h"	31 #include "crypto/symmetric_key.h"

32 #include "grit/generated_resources.h"	32 #include "grit/generated_resources.h"

33 #include "net/base/crypto_module.h"	33 #include "net/base/crypto_module.h"

34 #include "net/base/net_errors.h"	34 #include "net/base/net_errors.h"

35 #include "net/base/nss_cert_database.h"	35 #include "net/base/nss_cert_database.h"

36 #include "net/base/pem_tokenizer.h"	36 #include "net/base/pem_tokenizer.h"

(...skipping 2015 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
2052 // on the value of AuthenticationType.	2052 // on the value of AuthenticationType.

2053 { "L2TP-IPsec", PROVIDER_TYPE_L2TP_IPSEC_PSK },	2053 { "L2TP-IPsec", PROVIDER_TYPE_L2TP_IPSEC_PSK },

2054 { "OpenVPN", PROVIDER_TYPE_OPEN_VPN },	2054 { "OpenVPN", PROVIDER_TYPE_OPEN_VPN },

2055 };	2055 };

2056 CR_DEFINE_STATIC_LOCAL(EnumMapper<ProviderType>, parser,	2056 CR_DEFINE_STATIC_LOCAL(EnumMapper<ProviderType>, parser,

2057 (table, arraysize(table), PROVIDER_TYPE_MAX));	2057 (table, arraysize(table), PROVIDER_TYPE_MAX));

2058 return parser.Get(type);	2058 return parser.Get(type);

2059 }	2059 }

2060	2060

2061 } // namespace chromeos	2061 } // namespace chromeos

OLD	NEW