| 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: {
|
|
|