Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(826)

Side by Side Diff: net/proxy/proxy_config_service_linux.h

Issue 115029: Making command-line specified proxy settings more flexible - allowing for set... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « net/proxy/proxy_config_service_fixed.h ('k') | net/proxy/proxy_config_service_linux.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef NET_PROXY_PROXY_CONFIG_SERVICE_LINUX_H_ 5 #ifndef NET_PROXY_PROXY_CONFIG_SERVICE_LINUX_H_
6 #define NET_PROXY_PROXY_CONFIG_SERVICE_LINUX_H_ 6 #define NET_PROXY_PROXY_CONFIG_SERVICE_LINUX_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 74
75 private: 75 private:
76 // Obtains an environment variable's value. Parses a proxy server 76 // Obtains an environment variable's value. Parses a proxy server
77 // specification from it and puts it in result. Returns true if the 77 // specification from it and puts it in result. Returns true if the
78 // requested variable is defined and the value valid. 78 // requested variable is defined and the value valid.
79 bool GetProxyFromEnvVarForScheme(const char* variable, 79 bool GetProxyFromEnvVarForScheme(const char* variable,
80 ProxyServer::Scheme scheme, 80 ProxyServer::Scheme scheme,
81 ProxyServer* result_server); 81 ProxyServer* result_server);
82 // As above but with scheme set to HTTP, for convenience. 82 // As above but with scheme set to HTTP, for convenience.
83 bool GetProxyFromEnvVar(const char* variable, ProxyServer* result_server); 83 bool GetProxyFromEnvVar(const char* variable, ProxyServer* result_server);
84 // Parses entries from the value of the no_proxy env var, and stuffs 84
85 // them into config->proxy_bypass.
86 void ParseNoProxyList(const std::string& no_proxy, ProxyConfig* config);
87 // Fills proxy config from environment variables. Returns true if 85 // Fills proxy config from environment variables. Returns true if
88 // variables were found and the configuration is valid. 86 // variables were found and the configuration is valid.
89 bool GetConfigFromEnv(ProxyConfig* config); 87 bool GetConfigFromEnv(ProxyConfig* config);
90 88
91 // Obtains host and port gconf settings and parses a proxy server 89 // Obtains host and port gconf settings and parses a proxy server
92 // specification from it and puts it in result. Returns true if the 90 // specification from it and puts it in result. Returns true if the
93 // requested variable is defined and the value valid. 91 // requested variable is defined and the value valid.
94 bool GetProxyFromGConf(const char* key_prefix, bool is_socks, 92 bool GetProxyFromGConf(const char* key_prefix, bool is_socks,
95 ProxyServer* result_server); 93 ProxyServer* result_server);
96 // Fills proxy config from gconf. Returns true if settings were found 94 // Fills proxy config from gconf. Returns true if settings were found
97 // and the configuration is valid. 95 // and the configuration is valid.
98 bool GetConfigFromGConf(ProxyConfig* config); 96 bool GetConfigFromGConf(ProxyConfig* config);
99 97
100 scoped_ptr<EnvironmentVariableGetter> env_var_getter_; 98 scoped_ptr<EnvironmentVariableGetter> env_var_getter_;
101 scoped_ptr<GConfSettingGetter> gconf_getter_; 99 scoped_ptr<GConfSettingGetter> gconf_getter_;
102 100
103 DISALLOW_COPY_AND_ASSIGN(ProxyConfigServiceLinux); 101 DISALLOW_COPY_AND_ASSIGN(ProxyConfigServiceLinux);
104 }; 102 };
105 103
106 } // namespace net 104 } // namespace net
107 105
108 #endif // NET_PROXY_PROXY_CONFIG_SERVICE_LINUX_H_ 106 #endif // NET_PROXY_PROXY_CONFIG_SERVICE_LINUX_H_
OLDNEW
« no previous file with comments | « net/proxy/proxy_config_service_fixed.h ('k') | net/proxy/proxy_config_service_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698