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

Unified Diff: ui/webui/resources/cr_elements/network/cr_onc_types.js

Issue 2499483002: MD Settings: Internet: Allow Shared Proxies (Closed)
Patch Set: Rebase Created 4 years, 1 month 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
« no previous file with comments | « chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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));
« no previous file with comments | « chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698