Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(172)

Unified Diff: chromeos/network/onc/onc_validator.cc

Issue 949783003: Add WiMAX to ONC validation list (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add and fix tests Created 5 years, 10 months 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 side-by-side diff with in-line comments
Download patch
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);
}

Powered by Google App Engine
This is Rietveld 408576698