diff options
author | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-11 10:07:52 +0000 |
---|---|---|
committer | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-11 10:07:52 +0000 |
commit | 3a29593d5ef0a3d243a2417eca5510d2abfd8c13 (patch) | |
tree | 604e27797785e9acb4c0dc42535cc836f939783c /net/proxy/proxy_config_service_linux.h | |
parent | 24ac1426ea00b295174c9fbbf3b7b81396b74399 (diff) | |
download | chromium_src-3a29593d5ef0a3d243a2417eca5510d2abfd8c13.zip chromium_src-3a29593d5ef0a3d243a2417eca5510d2abfd8c13.tar.gz chromium_src-3a29593d5ef0a3d243a2417eca5510d2abfd8c13.tar.bz2 |
Allow ProxyConfigService to report "no configuration set"
Introduce a ConfigAvailability enum such that ProxyConfigService is able to return configuration status at a finer granularity level. This allows to fall back to default values (potentially configured through policy) if the system service doesn't have configuration.
BUG=none
TEST=unit tests, recommended proxy policy works on CrOS.
Review URL: http://codereview.chromium.org/6597070
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81085 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy/proxy_config_service_linux.h')
-rw-r--r-- | net/proxy/proxy_config_service_linux.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/proxy/proxy_config_service_linux.h b/net/proxy/proxy_config_service_linux.h index 5435226..2f1ad0c 100644 --- a/net/proxy/proxy_config_service_linux.h +++ b/net/proxy/proxy_config_service_linux.h @@ -144,7 +144,8 @@ class ProxyConfigServiceLinux : public ProxyConfigService { // Called from IO thread. void AddObserver(Observer* observer); void RemoveObserver(Observer* observer); - bool GetLatestProxyConfig(ProxyConfig* config); + ProxyConfigService::ConfigAvailability GetLatestProxyConfig( + ProxyConfig* config); // Posts a call to OnDestroy() to the UI thread. Called from // ProxyConfigServiceLinux's destructor. @@ -239,7 +240,8 @@ class ProxyConfigServiceLinux : public ProxyConfigService { // Called from IO thread. virtual void AddObserver(Observer* observer); virtual void RemoveObserver(Observer* observer); - virtual bool GetLatestProxyConfig(ProxyConfig* config); + virtual ProxyConfigService::ConfigAvailability GetLatestProxyConfig( + ProxyConfig* config); private: scoped_refptr<Delegate> delegate_; |