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..d39245076bb56a69905bd12ece7afddd2f93318f 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"; |
| const char* const kProxySettings[] = { |
| kProxyPacUrl, |
| @@ -45,6 +46,7 @@ const char* const kProxySettings[] = { |
| kProxySocks, |
| kProxySocksPort, |
| kProxyIgnoreList, |
| + kProxyUsePacUrl |
| }; |
| // We have to explicitly export this because the arraysize macro doesn't like |
| @@ -232,6 +234,19 @@ void SetProxyPrefValue(Profile* profile, |
| config_service->UISetProxyConfigToProxyPerScheme("http", |
| config.http_proxy.server); |
| } |
| + } else if (path == kProxyUsePacUrl) { |
| + bool val; |
| + if (in_value->GetAsBoolean(&val)) { |
| + if (val) { |
|
Dan Beam
2013/03/29 22:23:34
if (val && config.automatic_proxy.pac_url.is_valid
|
| + if (config.automatic_proxy.pac_url.is_valid()) |
|
Dan Beam
2013/03/29 22:23:34
nit: please use {curlies} in this if/else (even th
|
| + config_service->UISetProxyConfigToPACScript( |
| + config.automatic_proxy.pac_url); |
| + else |
|
Dan Beam
2013/03/29 22:23:34
nit: indent off
|
| + config_service->UISetProxyConfigToAutoDetect(); |
| + } else { |
| + config_service->UISetProxyConfigToAutoDetect(); |
| + } |
| + } |
| } else if (path == kProxyFtpUrl) { |
| std::string val; |
| if (in_value->GetAsString(&val)) { |
| @@ -337,6 +352,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) { |
| @@ -362,6 +380,7 @@ bool GetProxyPrefValue(Profile* profile, |
| } |
| // Decorate pref value as CoreOptionsHandler::CreateValueForPref() does. |
| + |
|
Dan Beam
2013/03/29 22:23:34
nit: please remove this \n
|
| DictionaryValue* dict = new DictionaryValue; |
| if (!data) |
| data = new base::StringValue(""); |