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

Unified Diff: chrome/browser/net/pref_proxy_config_tracker_impl.cc

Issue 10911099: Minor fixes in proxy configuration on iOS. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: indentation Created 8 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | net/proxy/proxy_config_service_ios.h » ('j') | net/proxy/proxy_config_service_ios.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 47b1078533c9896bfcd3a8fb783f4bf57912b8ff..6b4c30f35a42b13a52b695ae886cc6d716cbd3b2 100644
--- a/chrome/browser/net/pref_proxy_config_tracker_impl.cc
+++ b/chrome/browser/net/pref_proxy_config_tracker_impl.cc
@@ -314,10 +314,6 @@ void PrefProxyConfigTrackerImpl::Observe(
ProxyPrefs::ConfigState PrefProxyConfigTrackerImpl::ReadPrefConfig(
net::ProxyConfig* config) {
-#if defined(OS_IOS)
- return ProxyPrefs::CONFIG_UNSET;
-#else
-
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
// Clear the configuration and source.
@@ -346,5 +342,4 @@ ProxyPrefs::ConfigState PrefProxyConfigTrackerImpl::ReadPrefConfig(
}
return config_state;
-#endif // defined(OS_IOS)
}
« no previous file with comments | « no previous file | net/proxy/proxy_config_service_ios.h » ('j') | net/proxy/proxy_config_service_ios.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698