diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-07-05 22:27:03 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-07-08 17:55:06 +0100 |
| commit | a628b56b8b7c7f9a8730b0e43c6e04fcf3619b7e (patch) | |
| tree | 5db92e39e4ec9d08f6f53b3e6eb849b68d8d8ab7 | |
| parent | ddaac50eee27e3c14f766f64aa6d3957c90af3f8 (diff) | |
| download | external_chromium-a628b56b8b7c7f9a8730b0e43c6e04fcf3619b7e.zip external_chromium-a628b56b8b7c7f9a8730b0e43c6e04fcf3619b7e.tar.gz external_chromium-a628b56b8b7c7f9a8730b0e43c6e04fcf3619b7e.tar.bz2 | |
Merge Chromium at r12.0.742.93: Compile fix in android proxy
Functions changed upstream:
http://src.chromium.org/viewvc/chrome/branches/742/src/net/proxy/proxy_config_service.h?view=diff&pathrev=88489&r1=81084&r2=81085
Change-Id: Id420fe2cab4d27f0bc75543bd00a8089f5e6551c
| -rw-r--r-- | net/proxy/proxy_config_service_android.cc | 10 | ||||
| -rw-r--r-- | net/proxy/proxy_config_service_android.h | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/net/proxy/proxy_config_service_android.cc b/net/proxy/proxy_config_service_android.cc index e3be5af..86a596c 100644 --- a/net/proxy/proxy_config_service_android.cc +++ b/net/proxy/proxy_config_service_android.cc @@ -16,16 +16,16 @@ void ProxyConfigServiceAndroid::RemoveObserver(Observer* observer) { observers_.RemoveObserver(observer); } -bool ProxyConfigServiceAndroid::GetLatestProxyConfig(ProxyConfig* config) { +ProxyConfigService::ConfigAvailability ProxyConfigServiceAndroid::GetLatestProxyConfig(ProxyConfig* config) { if (!config) - return false; + return ProxyConfigService::CONFIG_UNSET; if (m_proxy.empty()) { *config = ProxyConfig::CreateDirect(); } else { config->proxy_rules().ParseFromString(m_proxy); } - return true; + return ProxyConfigService::CONFIG_VALID; } void ProxyConfigServiceAndroid::UpdateProxySettings(std::string& proxy, @@ -44,7 +44,9 @@ void ProxyConfigServiceAndroid::UpdateProxySettings(std::string& proxy, } config.proxy_rules().bypass_rules.AddRuleFromString(exList); - FOR_EACH_OBSERVER(Observer, observers_, OnProxyConfigChanged(config)); + FOR_EACH_OBSERVER(Observer, observers_, + OnProxyConfigChanged(config, + ProxyConfigService::CONFIG_VALID)); } } // namespace net diff --git a/net/proxy/proxy_config_service_android.h b/net/proxy/proxy_config_service_android.h index dc89c07..d4abfac 100644 --- a/net/proxy/proxy_config_service_android.h +++ b/net/proxy/proxy_config_service_android.h @@ -19,7 +19,7 @@ class ProxyConfigServiceAndroid : public ProxyConfigService { // ProxyConfigService implementation: virtual void AddObserver(Observer* observer); virtual void RemoveObserver(Observer* observer); - virtual bool GetLatestProxyConfig(ProxyConfig* config); + virtual ConfigAvailability GetLatestProxyConfig(ProxyConfig* config); virtual void OnLazyPoll() {} // For Android to update the proxy service config |