Intorduce a separate preference for 'proxy server mode'

chrome/browser/prefs/proxy_prefs.h

Index: chrome/browser/prefs/proxy_prefs.h
diff --git a/chrome/browser/prefs/proxy_prefs.h b/chrome/browser/prefs/proxy_prefs.h
new file mode 100644
index 0000000000000000000000000000000000000000..57574bf1e333dfb6b7177f072ab0e82e27617f33
--- /dev/null
+++ b/chrome/browser/prefs/proxy_prefs.h
@@ -0,0 +1,43 @@
+// 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_PREFS_PROXY_PREFS_H_
+#define CHROME_BROWSER_PREFS_PROXY_PREFS_H_
+#pragma once
+
+#include <string>
+
+class ProxyPrefs {

[Mattias Nissler (ping if slow), 2010/12/20 13:34:03]

Make it a namespace?

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

Done.

+ public:
+  // Possible types of specifying proxy settings. Do not change the order of
+  // the constants, because numeric values are exposed to users.
+  // If you add an enum constant, you should also add a string to
+  // kProxyModeNames in the .cc file.
+  enum ProxyServerMode {
+    // Direct connection to the network, other proxy preferences are ignored.
+    DISABLED = 0,
+
+    // Try to retrieve proxy settings from the following sources in the
+    // following order:
+    //  1. http://wpad/wpad.dat
+    //  2. The PAC script at kProxyPacUrl.
+    //  3. The settings specified in kProxyServer and kProxyBypassList
+    AUTO_DETECT = 1,
+
+    // Same as AUTO_DETECT except that 1. is always skipped.
+    MANUAL = 2,
+
+    // The system's proxy settings are used, other proxy preferences are
+    // ignored.
+    SYSTEM = 3,
+
+    NUM_MODES
+  };
+
+  static bool IntToProxyMode(int in_value, ProxyServerMode* out_value);
+  static bool StringToProxyMode(const std::string& in_value,
+                                ProxyServerMode* out_value);
+};
+
+#endif  // CHROME_BROWSER_PREFS_PROXY_PREFS_H_