Chromium Code Reviews| Index: chrome/browser/net/pref_proxy_config_tracker_impl.cc |
| diff --git a/chrome/browser/net/pref_proxy_config_tracker_impl.cc b/chrome/browser/net/pref_proxy_config_tracker_impl.cc |
| index 6b4c30f35a42b13a52b695ae886cc6d716cbd3b2..ab9f12ed3f2fa3a7eb7fb9c8c81d3013df21d602 100644 |
| --- a/chrome/browser/net/pref_proxy_config_tracker_impl.cc |
| +++ b/chrome/browser/net/pref_proxy_config_tracker_impl.cc |
| @@ -314,6 +314,10 @@ void PrefProxyConfigTrackerImpl::Observe( |
| ProxyPrefs::ConfigState PrefProxyConfigTrackerImpl::ReadPrefConfig( |
| net::ProxyConfig* config) { |
| +#if defined(OS_IOS) |
| + return ProxyPrefs::CONFIG_UNSET; |
|
wtc
2012/08/30 18:52:01
I suggest putting the rest of this function inside
eroman
2012/08/31 20:02:43
Why is this necessary?
|
| +#endif |
| + |
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| // Clear the configuration and source. |