| Index: chromeos/network/onc/onc_validator.cc
|
| diff --git a/chromeos/network/onc/onc_validator.cc b/chromeos/network/onc/onc_validator.cc
|
| index d9c626399867db6a978fdbed204a4ebf8d032fc7..d87f56251be02bd0c3b6e3cb33d3ef1b8c4678b1 100644
|
| --- a/chromeos/network/onc/onc_validator.cc
|
| +++ b/chromeos/network/onc/onc_validator.cc
|
| @@ -529,9 +529,11 @@ bool Validator::ValidateToplevelConfiguration(base::DictionaryValue* result) {
|
| bool Validator::ValidateNetworkConfiguration(base::DictionaryValue* result) {
|
| using namespace ::onc::network_config;
|
|
|
| - const char* const kValidTypes[] = {
|
| - ::onc::network_type::kEthernet, ::onc::network_type::kVPN,
|
| - ::onc::network_type::kWiFi, ::onc::network_type::kCellular};
|
| + const char* const kValidTypes[] = {::onc::network_type::kEthernet,
|
| + ::onc::network_type::kVPN,
|
| + ::onc::network_type::kWiFi,
|
| + ::onc::network_type::kCellular,
|
| + ::onc::network_type::kWimax};
|
| const std::vector<const char*> valid_types(toVector(kValidTypes));
|
| const char* const kValidIPConfigTypes[] = {kIPConfigTypeDHCP,
|
| kIPConfigTypeStatic};
|
| @@ -591,6 +593,9 @@ bool Validator::ValidateNetworkConfiguration(base::DictionaryValue* result) {
|
| } else if (type == ::onc::network_type::kCellular) {
|
| all_required_exist &=
|
| RequireField(*result, ::onc::network_config::kCellular);
|
| + } else if (type == ::onc::network_type::kWimax) {
|
| + all_required_exist &=
|
| + RequireField(*result, ::onc::network_config::kWimax);
|
| } else if (type == ::onc::network_type::kVPN) {
|
| all_required_exist &= RequireField(*result, ::onc::network_config::kVPN);
|
| }
|
|
|