Introduce a separate preference for 'proxy server mode'

chrome/browser/policy/configuration_policy_store_interface.h

Index: chrome/browser/policy/configuration_policy_store_interface.h
diff --git a/chrome/browser/policy/configuration_policy_store_interface.h b/chrome/browser/policy/configuration_policy_store_interface.h
index cfb943eeff67029080326bd67ab01a68e3c24e5d..f873ed279c1d4748ce36b18097357dccc59e2fb7 100644
--- a/chrome/browser/policy/configuration_policy_store_interface.h
+++ b/chrome/browser/policy/configuration_policy_store_interface.h
@@ -25,7 +25,7 @@ enum ConfigurationPolicyType {
   kPolicyDefaultSearchProviderIconURL,
   kPolicyDefaultSearchProviderEncodings,
   kPolicyDisableSpdy,
-  kPolicyProxyServerMode,
+  kPolicyProxyMode,
   kPolicyProxyServer,
   kPolicyProxyPacUrl,
   kPolicyProxyBypassList,
@@ -66,10 +66,22 @@ enum ConfigurationPolicyType {
   kPolicyGSSAPILibraryName,
 };
 
-static const int kPolicyNoProxyServerMode = 0;
-static const int kPolicyAutoDetectProxyMode = 1;
-static const int kPolicyManuallyConfiguredProxyMode = 2;
-static const int kPolicyUseSystemProxyMode = 3;
+
+// Constants for the "Proxy Server Mode" defined in the policies.
+// Note that these diverge from internal presentation defined in
+// ProxyPrefs::ProxyMode for legacy reasons.

[Mattias Nissler (ping if slow), 2010/12/21 15:54:29]

You should also explain what these legacy reasons are.

[battre (please use the other), 2010/12/21 20:14:09]

Done.

+enum PolicyProxyModeType {
+  // Disable Proxy, connect directly.
+  kPolicyNoProxyServerMode = 0,
+  // Auto detect proxy or use specific PAC script if given.
+  kPolicyAutoDetectProxyMode = 1,
+  // Use manually configured proxy servers (fixed servers).
+  kPolicyManuallyConfiguredProxyMode = 2,
+  // Use system proxy server.
+  kPolicyUseSystemProxyMode = 3,
+
+  NUM_PROXY_MODES
+};
 
 // An abstract super class for policy stores that provides a method that can be
 // called by a |ConfigurationPolicyProvider| to specify a policy.
@@ -82,6 +94,8 @@ class ConfigurationPolicyStoreInterface {
   // store takes over the ownership of |value|.
   virtual void Apply(ConfigurationPolicyType policy, Value* value) = 0;
 
+  // Called after all values have been passed to Apply.
+  virtual void Completed() = 0;
  protected:
   ConfigurationPolicyStoreInterface() {}