Making command-line specified proxy settings more flexible - allowing for set...

chrome/common/chrome_switches.cc

 // Copyright (c) 2006-2009 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/chrome_switches.h"
 
 #include "base/base_switches.h"
 
 namespace switches {
 
@@ skipping 215 matching lines @@
 
 const wchar_t kShowIcons[]                     = L"show-icons";
 
 // Make Chrome default browser
 const wchar_t kMakeDefaultBrowser[]            = L"make-default-browser";
 
 // Use a specified proxy server, overrides system settings. This switch only
 // affects HTTP and HTTPS requests.
 const wchar_t kProxyServer[]                   = L"proxy-server";
 
+// Don't use a proxy server, always make direct connections. Overrides any
+// other proxy server flags that are passed.
+const wchar_t kNoProxyServer[]                 = L"no-proxy-server";
+
+// Specify a list of URLs for whom we bypass proxy settings and use direct
+// connections. Ignored if proxy-server-auto-detect or no-proxy-server are
+// also specified.
+// TODO(robertshield): Specify URL format.
+const wchar_t kProxyServerBypassUrls[]         = L"proxy-server-bypass-urls";
+
+// Force proxy auto-detection.
+const wchar_t kProxyServerAutoDetect[]         = L"proxy-server-auto-detect";
+
+// Use the pac script at the given URL
+const wchar_t kProxyServerPacUrl[]             = L"proxy-server-pac-url";
+
 // Use WinHTTP to fetch and evaluate PAC scripts. Otherwise the default is
 // to use Chromium's network stack to fetch, and V8 to evaluate.
-const wchar_t kWinHttpProxyResolver[]               = L"winhttp-proxy-resolver";
+const wchar_t kWinHttpProxyResolver[]          = L"winhttp-proxy-resolver";
 
 // Chrome will support prefetching of DNS information.  Until this becomes
 // the default, we'll provide a command line switch.
 extern const wchar_t kDnsLogDetails[]          = L"dns-log-details";
 extern const wchar_t kDnsPrefetchDisable[]     = L"dns-prefetch-disable";
 
 // Enables support to debug printing subsystem.
 const wchar_t kDebugPrint[]                    = L"debug-print";
 
 // Allow initialization of all activex controls. This is only to help website
@@ skipping 178 matching lines @@
 const wchar_t kDisableAudio[]                  = L"disable-audio";
 
 // Replaces the buffered data source for <audio> and <video> with a simplified
 // resource loader that downloads the entire resource into memory.
 //
 // TODO(scherkus): remove --simple-data-source when our media resource loading
 // is cleaned up and playback testing completed.
 const wchar_t kSimpleDataSource[]              = L"simple-data-source";
 
 }  // namespace switches