| Index: ui/webui/resources/cr_elements/network/cr_onc_types.js
|
| diff --git a/ui/webui/resources/cr_elements/network/cr_onc_types.js b/ui/webui/resources/cr_elements/network/cr_onc_types.js
|
| index 35ff79cf47a9a8bce1a16866f93a360b853a1900..3e5a2d850adc67d3a04adaa76a7d51f5d7752df8 100644
|
| --- a/ui/webui/resources/cr_elements/network/cr_onc_types.js
|
| +++ b/ui/webui/resources/cr_elements/network/cr_onc_types.js
|
| @@ -170,6 +170,12 @@ CrOnc.getActiveValue = function(property) {
|
| return property[effective];
|
| }
|
|
|
| + // If no Effective value, return the UserSetting or DeviceSetting.
|
| + if ('UserSetting' in property)
|
| + return property['UserSetting'];
|
| + if ('DeviceSetting' in property)
|
| + return property['DeviceSetting'];
|
| +
|
| console.error(
|
| 'getActiveValue called on invalid ONC object: ' +
|
| JSON.stringify(property));
|
|
|