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

Unified Diff: extensions/browser/api/networking_private/networking_private_chromeos.cc

Issue 2839693003: MD Settings: Fix networking config errors (Closed)
Patch Set: Feedback Created 3 years, 8 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
« no previous file with comments | « components/onc/docs/onc_spec.md ('k') | extensions/common/api/networking_onc.idl » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/browser/api/networking_private/networking_private_chromeos.cc
diff --git a/extensions/browser/api/networking_private/networking_private_chromeos.cc b/extensions/browser/api/networking_private/networking_private_chromeos.cc
index 93d4103ebdee711896f7d62dc276c7551bdea8b4..c030fda7e2c51b23d06bcdee768c5dca504803e2 100644
--- a/extensions/browser/api/networking_private/networking_private_chromeos.cc
+++ b/extensions/browser/api/networking_private/networking_private_chromeos.cc
@@ -860,10 +860,14 @@ void NetworkingPrivateChromeOS::SetManagedActiveProxyValues(
case UIProxyConfig::MODE_PROXY_PER_SCHEME: {
base::DictionaryValue* manual =
EnsureDictionaryValue(::onc::proxy::kManual, proxy_settings);
- SetManualProxy(manual, state, ::onc::proxy::kHttp, config.http_proxy);
- SetManualProxy(manual, state, ::onc::proxy::kHttps, config.https_proxy);
- SetManualProxy(manual, state, ::onc::proxy::kFtp, config.ftp_proxy);
- SetManualProxy(manual, state, ::onc::proxy::kSocks, config.socks_proxy);
+ if (config.http_proxy.server.is_valid())
+ SetManualProxy(manual, state, ::onc::proxy::kHttp, config.http_proxy);
+ if (config.https_proxy.server.is_valid())
+ SetManualProxy(manual, state, ::onc::proxy::kHttps, config.https_proxy);
+ if (config.ftp_proxy.server.is_valid())
+ SetManualProxy(manual, state, ::onc::proxy::kFtp, config.ftp_proxy);
+ if (config.socks_proxy.server.is_valid())
+ SetManualProxy(manual, state, ::onc::proxy::kSocks, config.socks_proxy);
break;
}
case UIProxyConfig::MODE_PAC_SCRIPT: {
« no previous file with comments | « components/onc/docs/onc_spec.md ('k') | extensions/common/api/networking_onc.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698