Added "Use an autoconfiguration URL" checkbox in proxy tab

chrome/browser/chromeos/proxy_cros_settings_parser.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/proxy_cros_settings_parser.h"
 
 #include "base/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/proxy_config_service_impl.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 11 matching lines @@
 const char kProxyHttpPort[]       = "cros.session.proxy.httpport";
 const char kProxyHttpsUrl[]       = "cros.session.proxy.httpsurl";
 const char kProxyHttpsPort[]      = "cros.session.proxy.httpsport";
 const char kProxyType[]           = "cros.session.proxy.type";
 const char kProxySingle[]         = "cros.session.proxy.single";
 const char kProxyFtpUrl[]         = "cros.session.proxy.ftpurl";
 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,
   kProxySingleHttp,
   kProxySingleHttpPort,
   kProxyHttpUrl,
   kProxyHttpPort,
   kProxyHttpsUrl,
   kProxyHttpsPort,
   kProxyType,
   kProxySingle,
   kProxyFtpUrl,
   kProxyFtpPort,
   kProxySocks,
   kProxySocksPort,
   kProxyIgnoreList,
+  kProxyUsePacUrl
 };
 
 // We have to explicitly export this because the arraysize macro doesn't like
 // extern arrays as their size is not known on compile time.
 const size_t kProxySettingsCount = arraysize(kProxySettings);
 
 namespace {
 
 base::Value* CreateServerHostValue(
     const ProxyConfigServiceImpl::ProxyConfig::ManualProxy& proxy) {
@@ skipping 167 matching lines @@
   } else if (path == kProxySingle) {
     bool val;
     if (in_value->GetAsBoolean(&val)) {
       if (val)
         config_service->UISetProxyConfigToSingleProxy(
             config.single_proxy.server);
       else
         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()) {
  config_service->UISetProxyConfigToPACScript(
      config.automatic_proxy.pac_url);
} else {
  config_service->UISetProxyConfigToAutoDetect();
}

+        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 though bad code around here
doesn't)

+           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)) {
       config_service->UISetProxyConfigToProxyPerScheme("ftp",
           CreateProxyServerFromHost(
               val, config.ftp_proxy, net::ProxyServer::SCHEME_HTTP));
     }
   } else if (path == kProxyFtpPort) {
     int val;
     if (in_value->GetAsInteger(&val)) {
@@ skipping 85 matching lines @@
         controlled_by = "other";
         break;
       default:
         if (!config.user_modifiable)
           controlled_by = "shared";
         break;
     }
   } 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) {
     data = CreateServerHostValue(config.socks_proxy);
   } else if (path == kProxyHttpPort) {
     data = CreateServerPortValue(config.http_proxy);
   } else if (path == kProxyHttpsPort) {
     data = CreateServerPortValue(config.https_proxy);
   } else if (path == kProxyFtpPort) {
     data = CreateServerPortValue(config.ftp_proxy);
   } else if (path == kProxySocksPort) {
     data = CreateServerPortValue(config.socks_proxy);
   } else if (path == kProxyIgnoreList) {
     ListValue* list =  new ListValue();
     net::ProxyBypassRules::RuleList bypass_rules = config.bypass_rules.rules();
     for (size_t x = 0; x < bypass_rules.size(); x++) {
       list->Append(new base::StringValue(bypass_rules[x]->ToString()));
     }
     data = list;
   } else {
     *out_value = NULL;
     return false;
   }
 
   // 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("");
   dict->Set("value", data);
   if (path == kProxyType) {
     dict->SetString("controlledBy", controlled_by);
     dict->SetBoolean("disabled", !config.user_modifiable);
   } else {
     dict->SetBoolean("disabled", false);
   }
   *out_value = dict;
   return true;
 }
 
 }  // namespace proxy_cros_settings_parser
 
 }  // namespace chromeos