summaryrefslogtreecommitdiffstats
path: root/net/proxy/proxy_config_service_linux.h
diff options
context:
space:
mode:
authormattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-22 00:22:49 +0000
committermattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-22 00:22:49 +0000
commit87fc168b364ef36033f72e545a4894bd7ce9354f (patch)
tree8dd7a36186859c6b42be3156178373d91599e310 /net/proxy/proxy_config_service_linux.h
parentbda0b8792b40ce11649995a622344b0aa91b7a9d (diff)
downloadchromium_src-87fc168b364ef36033f72e545a4894bd7ce9354f.zip
chromium_src-87fc168b364ef36033f72e545a4894bd7ce9354f.tar.gz
chromium_src-87fc168b364ef36033f72e545a4894bd7ce9354f.tar.bz2
Try again: Add proxy config (using gnome-network-preferences)
BUG=11507 TEST=Open options, click change proxy, gnome-network-preferences should launch.  If gnome isn't installed or running, LinuxProxyConfig wiki page should load. Review URL: http://codereview.chromium.org/155792 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21246 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy/proxy_config_service_linux.h')
-rw-r--r--net/proxy/proxy_config_service_linux.h16
1 files changed, 4 insertions, 12 deletions
diff --git a/net/proxy/proxy_config_service_linux.h b/net/proxy/proxy_config_service_linux.h
index 2788731..00c31ff 100644
--- a/net/proxy/proxy_config_service_linux.h
+++ b/net/proxy/proxy_config_service_linux.h
@@ -9,6 +9,7 @@
#include <vector>
#include "base/basictypes.h"
+#include "base/linux_util.h"
#include "base/message_loop.h"
#include "base/ref_counted.h"
#include "base/scoped_ptr.h"
@@ -23,15 +24,6 @@ namespace net {
class ProxyConfigServiceLinux : public ProxyConfigService {
public:
- // These are used to derive mocks for unittests.
- class EnvironmentVariableGetter {
- public:
- virtual ~EnvironmentVariableGetter() {}
- // Gets an environment variable's value and stores it in
- // result. Returns false if the key is unset.
- virtual bool Getenv(const char* variable_name, std::string* result) = 0;
- };
-
class GConfSettingGetter {
public:
virtual ~GConfSettingGetter() {}
@@ -89,7 +81,7 @@ class ProxyConfigServiceLinux : public ProxyConfigService {
public:
// Constructor receives gconf and env var getter implementations
// to use, and takes ownership of them.
- Delegate(EnvironmentVariableGetter* env_var_getter,
+ Delegate(base::EnvironmentVariableGetter* env_var_getter,
GConfSettingGetter* gconf_getter);
// Synchronously obtains the proxy configuration. If gconf is
// used, also enables gconf notification for setting
@@ -151,7 +143,7 @@ class ProxyConfigServiceLinux : public ProxyConfigService {
// carry the new config information.
void SetNewProxyConfig(const ProxyConfig& new_config);
- scoped_ptr<EnvironmentVariableGetter> env_var_getter_;
+ scoped_ptr<base::EnvironmentVariableGetter> env_var_getter_;
scoped_ptr<GConfSettingGetter> gconf_getter_;
// Cached proxy configuration, to be returned by
@@ -186,7 +178,7 @@ class ProxyConfigServiceLinux : public ProxyConfigService {
// Usual constructor
ProxyConfigServiceLinux();
// For testing: takes alternate gconf and env var getter implementations.
- ProxyConfigServiceLinux(EnvironmentVariableGetter* env_var_getter,
+ ProxyConfigServiceLinux(base::EnvironmentVariableGetter* env_var_getter,
GConfSettingGetter* gconf_getter);
virtual ~ProxyConfigServiceLinux() {