Chromium Code Reviews| Index: chrome/browser/chromeos/proxy_cros_settings_parser.cc |
| diff --git a/chrome/browser/chromeos/proxy_cros_settings_parser.cc b/chrome/browser/chromeos/proxy_cros_settings_parser.cc |
| index e902a5e0738f0bc3882ca7adc816b8ead8f9bde1..9a5e43031b3ef7049063b2057c1dddaf585dc080 100644 |
| --- a/chrome/browser/chromeos/proxy_cros_settings_parser.cc |
| +++ b/chrome/browser/chromeos/proxy_cros_settings_parser.cc |
| @@ -29,6 +29,7 @@ const char kProxyFtpPort[] = "cros.session.proxy.ftpport"; |
| const char kProxySocks[] = "cros.session.proxy.socks"; |
| const char kProxySocksPort[] = "cros.session.proxy.socksport"; |
| const char kProxyIgnoreList[] = "cros.session.proxy.ignorelist"; |
| +const char kProxyUsePacUrl[] = "cros.session.proxy.usepacurl"; |
|
pneubeck (no reviews)
2013/04/09 09:48:19
I don't like this forwarding of every UI element's
sathish.kuppuswamy
2013/04/16 16:46:57
Hi pneubeck,
Here(.js) you want me to check the
|
| const char* const kProxySettings[] = { |
| kProxyPacUrl, |
| @@ -45,6 +46,7 @@ const char* const kProxySettings[] = { |
| kProxySocks, |
| kProxySocksPort, |
| kProxyIgnoreList, |
| + kProxyUsePacUrl |
|
Dan Beam
2013/04/06 01:45:14
nit: ,
|
| }; |
| // We have to explicitly export this because the arraysize macro doesn't like |
| @@ -232,6 +234,16 @@ void SetProxyPrefValue(Profile* profile, |
| config_service->UISetProxyConfigToProxyPerScheme("http", |
| config.http_proxy.server); |
| } |
| + } else if (path == kProxyUsePacUrl) { |
| + bool use_pac_url; |
| + if (in_value->GetAsBoolean(&use_pac_url)) { |
| + if (use_pac_url && config.automatic_proxy.pac_url.is_valid()) { |
| + config_service->UISetProxyConfigToPACScript( |
| + config.automatic_proxy.pac_url); |
| + } else { |
| + config_service->UISetProxyConfigToAutoDetect(); |
| + } |
| + } |
| } else if (path == kProxyFtpUrl) { |
| std::string val; |
| if (in_value->GetAsString(&val)) { |
| @@ -337,6 +349,9 @@ bool GetProxyPrefValue(Profile* profile, |
| } else if (path == kProxySingle) { |
| data = base::Value::CreateBooleanValue(config.mode == |
| chromeos::ProxyConfigServiceImpl::ProxyConfig::MODE_SINGLE_PROXY); |
| + } else if (path == kProxyUsePacUrl) { |
| + data = base::Value::CreateBooleanValue(config.mode == |
| + chromeos::ProxyConfigServiceImpl::ProxyConfig::MODE_PAC_SCRIPT); |
| } else if (path == kProxyFtpUrl) { |
| data = CreateServerHostValue(config.ftp_proxy); |
| } else if (path == kProxySocks) { |