Chromium Code Reviews| Index: chromeos/network/managed_network_configuration_handler_impl.cc |
| diff --git a/chromeos/network/managed_network_configuration_handler_impl.cc b/chromeos/network/managed_network_configuration_handler_impl.cc |
| index eb16c55d7f5add1faea8b3ae6290bfadbe70cef0..54985b114066132fbc4ce0ea383ee8314a90c1bb 100644 |
| --- a/chromeos/network/managed_network_configuration_handler_impl.cc |
| +++ b/chromeos/network/managed_network_configuration_handler_impl.cc |
| @@ -32,6 +32,7 @@ |
| #include "chromeos/network/onc/onc_merger.h" |
| #include "chromeos/network/onc/onc_signature.h" |
| #include "chromeos/network/onc/onc_translator.h" |
| +#include "chromeos/network/onc/onc_utils.h" |
| #include "chromeos/network/onc/onc_validator.h" |
| #include "chromeos/network/policy_util.h" |
| #include "chromeos/network/shill_property_util.h" |
| @@ -289,6 +290,12 @@ void ManagedNetworkConfigurationHandlerImpl::SetProperties( |
| *user_settings_copy, |
| &validation_result); |
| + // fill in HexSSID field from contents of SSID field if not set already |
| + if (user_settings_copy.get() != NULL) |
|
pneubeck (no reviews)
2014/11/27 14:49:02
nit: no .get()!=NULL and missing braces
if (user_
cschuet (SLOW)
2014/11/27 15:44:30
Done.
|
| + onc::FillInHexSSIDFieldsInOncObject( |
| + onc::kToplevelConfigurationSignature, user_settings_copy.get()); |
|
pneubeck (no reviews)
2014/11/27 14:49:02
bug:
user_settings_copy -> validated_user_settings
cschuet (SLOW)
2014/11/27 15:44:30
Acknowledged.
|
| + |
| + |
| if (validation_result == onc::Validator::INVALID) { |
| InvokeErrorCallback(service_path, error_callback, kInvalidUserSettings); |
| return; |