redesign and reimplement proxy config service and tracker, revise proxy ui on cros

chrome/browser/chromeos/proxy_cros_settings_provider.cc

 // Copyright (c) 2011 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_provider.h"
 
 #include "base/string_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/cros_settings.h"
 #include "chrome/browser/ui/browser_list.h"
@@ skipping 29 matching lines @@
   kProxyFtpPort,
   kProxySocks,
   kProxySocksPort,
   kProxyIgnoreList,
 };
 
 //------------------ ProxyCrosSettingsProvider: public methods -----------------
 
 ProxyCrosSettingsProvider::ProxyCrosSettingsProvider() { }
 
-void ProxyCrosSettingsProvider::SetCurrentNetwork(const std::string& network) {
-  if (!GetConfigService()->UISetCurrentNetwork(network))
-    return;
+void ProxyCrosSettingsProvider::SetCurrentNetworkWithProfile(
+    const std::string& network, Profile* profile) {
+  GetConfigService()->UISetCurrentNetworkWithProfile(network, profile);
   for (size_t i = 0; i < arraysize(kProxySettings); ++i)
     CrosSettings::Get()->FireObservers(kProxySettings[i]);
 }
 
-void ProxyCrosSettingsProvider::MakeActiveNetworkCurrent() {
-  if (!GetConfigService()->UIMakeActiveNetworkCurrent())
-    return;
+void ProxyCrosSettingsProvider::MakeActiveNetworkCurrentWithProfile(
+    Profile* profile) {
+  GetConfigService()->UIMakeActiveNetworkCurrentWithProfile(profile);
   for (size_t i = 0; i < arraysize(kProxySettings); ++i)
     CrosSettings::Get()->FireObservers(kProxySettings[i]);
 }
 
-bool ProxyCrosSettingsProvider::IsUsingSharedProxies() const {
-  return GetConfigService()->use_shared_proxies();
-}
-
 const std::string& ProxyCrosSettingsProvider::GetCurrentNetworkName() const {
   return GetConfigService()->current_network_name();
 }
 
 void ProxyCrosSettingsProvider::DoSet(const std::string& path,
                                       Value* in_value) {
   if (!in_value) {
     return;
   }
 
@@ skipping 150 matching lines @@
       }
       config_service->UISetProxyConfigBypassRules(bypass_rules);
     }
   }
 }
 
 bool ProxyCrosSettingsProvider::Get(const std::string& path,
                                     Value** out_value) const {
   bool found = false;
   bool managed = false;
+  std::string controlled_by;
   Value* data = NULL;
   chromeos::ProxyConfigServiceImpl* config_service = GetConfigService();
   chromeos::ProxyConfigServiceImpl::ProxyConfig config;
   config_service->UIGetProxyConfig(&config);
 
   if (path == kProxyPacUrl) {
     // Only show pacurl for pac-script mode.
     if (config.mode ==
             chromeos::ProxyConfigServiceImpl::ProxyConfig::MODE_PAC_SCRIPT &&
         config.automatic_proxy.pac_url.is_valid()) {
@@ skipping 19 matching lines @@
         chromeos::ProxyConfigServiceImpl::ProxyConfig::MODE_PAC_SCRIPT) {
       data = Value::CreateIntegerValue(3);
     } else if (config.mode ==
         chromeos::ProxyConfigServiceImpl::ProxyConfig::MODE_SINGLE_PROXY ||
         config.mode ==
         chromeos::ProxyConfigServiceImpl::ProxyConfig::MODE_PROXY_PER_SCHEME) {
       data = Value::CreateIntegerValue(2);
     } else {
       data = Value::CreateIntegerValue(1);
     }
+    switch (config.source) {

[stevenjb, 2011/10/05 00:22:57]

This logic would need to change if config.source were split up, but I still
think it will be more readable.

[kuan, 2011/10/07 00:30:41]

Done.

+       case ProxyConfigServiceImpl::ProxyConfig::SOURCE_POLICY:
+       case ProxyConfigServiceImpl::ProxyConfig::SOURCE_RECOMMENDED:

[Mattias Nissler (ping if slow), 2011/10/05 10:18:36]

I think this is misleading, since the banner is there to indicate why the user
cannot edit stuff. In the case of recommended proxies the settings can be
modified though. Can we just not show the banner in this case? This is also what
we do for regular prefs in Chrome.

[kuan, 2011/10/07 00:30:41]

this didn't from me; it comes from sumit and kenmoore. sumit wants user to know
proxy is recommended, not from network. this is why he asks glenn for permission
to change "Some settings have been disabled by your adminstrator." to "Some
settings are being managed by your adminstrator." so that both policy and
recommended proxies can use the same string (u were cc'ed that email from sumit)
.
On 2011/10/05 10:18:36, Mattias Nissler wrote:

[Mattias Nissler (ping if slow), 2011/10/07 13:32:10]

It seems I misunderstood this. The point here is that the banner should only be
shown if the user cannot change the settings. If that is the case (and looking
at the code it seems to to this), I'm fine.

+         controlled_by = "policyManagedPrefsBannerText";
+         break;
+       case ProxyConfigServiceImpl::ProxyConfig::SOURCE_EXTENSION:
+         controlled_by = "extensionManagedPrefsBannerText";
+         break;
+       default:
+         if (!config.IsUserModifiable())
+           controlled_by = "enableSharedProxiesBannerText";
+         break;
+    }
     found = true;
   } else if (path == kProxySingle) {
     data = Value::CreateBooleanValue(config.mode ==
         chromeos::ProxyConfigServiceImpl::ProxyConfig::MODE_SINGLE_PROXY);
     found = true;
   } else if (path == kProxyFtpUrl) {
     data = CreateServerHostValue(config.ftp_proxy);
     found = true;
   } else if (path == kProxySocks) {
     data = CreateServerHostValue(config.socks_proxy);
@@ skipping 18 matching lines @@
     }
     *out_value = list;
     return true;
   }
   if (found) {
     DictionaryValue* dict = new DictionaryValue;
     if (!data)
       data = Value::CreateStringValue("");
     dict->Set("value", data);
     dict->SetBoolean("managed", managed);
+    if (path == kProxyType) {

[Mattias Nissler (ping if slow), 2011/10/07 13:32:10]

why only for the type?

+      dict->SetString("controlledBy", controlled_by);
+      dict->SetBoolean("disabled", !config.IsUserModifiable());
+    }
     *out_value = dict;
     return true;
   } else {
     *out_value = NULL;
     return false;
   }
 }
 
 bool ProxyCrosSettingsProvider::HandlesSetting(const std::string& path) const {
   return ::StartsWithASCII(path, "cros.session.proxy", true);
@@ skipping 42 matching lines @@
 }
 
 Value* ProxyCrosSettingsProvider::CreateServerPortValue(
     const ProxyConfigServiceImpl::ProxyConfig::ManualProxy& proxy) const {
   return proxy.server.is_valid() ?
          Value::CreateIntegerValue(proxy.server.host_port_pair().port()) :
          NULL;
 }
 
 }  // namespace chromeos