Introduce a separate preference for 'proxy server mode'

chrome/common/pref_names.cc

 // 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.
 
 #include "chrome/common/pref_names.h"
 
 namespace prefs {
 
 // *************** PROFILE PREFS ***************
 // These are attached to the user profile
@@ skipping 1117 matching lines @@
 // The email address of the account used to authenticate with the Cloud Print
 // server.
 const char kCloudPrintEmail[] = "cloud_print.email";
 // Settings specific to underlying print system.
 const char kCloudPrintPrintSystemSettings[] =
     "cloud_print.print_system_settings";
 
 // Used by the service process to determine if the remoting host is enabled.
 const char kRemotingHostEnabled[] = "remoting.host_enabled";
 
-// Boolean to disable proxy altogether. If true, other proxy
-// preferences are ignored.
-const char kNoProxyServer[] = "proxy.disabled";
-// Boolean specifying if proxy should be auto-detected.
-const char kProxyAutoDetect[] = "proxy.auto_detect";
+// Integer to specify the type of proxy settings.
+// See ProxyPrefs for possible values and interactions with the other proxy
+// preferences.
+const char kProxyMode[] = "proxy.mode";
 // String specifying the proxy server. For a specification of the expected
 // syntax see net::ProxyConfig::ProxyRules::ParseFromString().
 const char kProxyServer[] = "proxy.server";
 // URL to the proxy .pac file.
 const char kProxyPacUrl[] = "proxy.pac_url";
 // String containing proxy bypass rules. For a specification of the
 // expected syntax see net::ProxyBypassRules::ParseFromString().
 const char kProxyBypassList[] = "proxy.bypass_list";
 
 // Preferences that are exclusivly used to store managed values for default
 // content settings.
 const char kManagedDefaultCookiesSetting[] =
     "profile.managed_default_content_settings.cookies";
 const char kManagedDefaultImagesSetting[] =
     "profile.managed_default_content_settings.images";
 const char kManagedDefaultJavaScriptSetting[] =
     "profile.managed_default_content_settings.javascript";
 const char kManagedDefaultPluginsSetting[] =
     "profile.managed_default_content_settings.plugins";
 const char kManagedDefaultPopupsSetting[] =
     "profile.managed_default_content_settings.popups";
 
 // Dictionary for storing the set of known background pages (keys are extension
 // IDs of background page owners, value is a boolean that is true if the user
 // needs to acknowledge this page.
 const char kKnownBackgroundPages[] = "background_pages.known";
 }  // namespace prefs