Intorduce a separate preference for 'proxy server mode'

chrome/browser/net/pref_proxy_config_service.h

 // Copyright (c) 2010 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.
 
 #ifndef CHROME_BROWSER_NET_PREF_PROXY_CONFIG_SERVICE_H_
 #define CHROME_BROWSER_NET_PREF_PROXY_CONFIG_SERVICE_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/observer_list.h"
@@ skipping 74 matching lines @@
 };
 
 // A net::ProxyConfigService implementation that applies preference proxy
 // settings as overrides to the proxy configuration determined by a baseline
 // delegate ProxyConfigService.
 class PrefProxyConfigService
     : public net::ProxyConfigService,
       public net::ProxyConfigService::Observer,
       public PrefProxyConfigTracker::Observer {
  public:
+  // Possible types of specifying proxy settings. The numeric values must
+  // correspond to the policy::kPolicy*Proxy*Mode constants.
+  enum ProxyServerMode {
+    DISABLED,
+    AUTO_DETECT,
+    MANUAL,
+    SYSTEM
+  };
+
   // Takes ownership of the passed |base_service|.
   PrefProxyConfigService(PrefProxyConfigTracker* tracker,
                          net::ProxyConfigService* base_service);
   virtual ~PrefProxyConfigService();
 
   // ProxyConfigService implementation:
   virtual void AddObserver(net::ProxyConfigService::Observer* observer);
   virtual void RemoveObserver(net::ProxyConfigService::Observer* observer);
   virtual bool GetLatestProxyConfig(net::ProxyConfig* config);
   virtual void OnLazyPoll();
 
   static void RegisterUserPrefs(PrefService* user_prefs);
 
+  static bool IntToMode(int in_value, ProxyServerMode* out_value);

[danno, 2010/12/14 12:48:17]

This could be ModeStringToEnum.

[gfeher, 2010/12/16 10:42:04]

I still need this to convert from policy and preference integer values.

+
  private:
   // ProxyConfigService::Observer implementation:
   virtual void OnProxyConfigChanged(const net::ProxyConfig& config);
 
   // PrefProxyConfigTracker::Observer implementation:
   virtual void OnPrefProxyConfigChanged();
 
   // Makes sure that the observer registrations with the base service and the
   // tracker object are set up.
   void RegisterObservers();
 
   scoped_ptr<net::ProxyConfigService> base_service_;
   ObserverList<net::ProxyConfigService::Observer, true> observers_;
   scoped_refptr<PrefProxyConfigTracker> pref_config_tracker_;
 
   // Indicates whether the base service and tracker registrations are done.
   bool registered_observers_;
 
   DISALLOW_COPY_AND_ASSIGN(PrefProxyConfigService);
 };
 
 #endif  // CHROME_BROWSER_NET_PREF_PROXY_CONFIG_SERVICE_H_