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

Unified Diff: net/proxy/proxy_service.cc

Issue 6526059: Plumb through NetworkChangeNotifier::IsOffline() to WebKit, enabling (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Appease the C++ type system Created 9 years, 10 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 | « net/proxy/proxy_service.h ('k') | net/socket/client_socket_pool_base.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/proxy/proxy_service.cc
diff --git a/net/proxy/proxy_service.cc b/net/proxy/proxy_service.cc
index 13d049e49ab03034d98ec77cc97ba08d0c64c0f2..47673c5b2d359c918d6f645c895fa4c9dc2e273b 100644
--- a/net/proxy/proxy_service.cc
+++ b/net/proxy/proxy_service.cc
@@ -384,7 +384,7 @@ ProxyService::ProxyService(ProxyConfigService* config_service,
stall_proxy_auto_config_delay_(
base::TimeDelta::FromMilliseconds(
kNumMillisToStallAfterNetworkChanges)) {
- NetworkChangeNotifier::AddObserver(this);
+ NetworkChangeNotifier::AddIPAddressObserver(this);
ResetConfigService(config_service);
}
@@ -560,7 +560,7 @@ int ProxyService::TryToCompleteSynchronously(const GURL& url,
}
ProxyService::~ProxyService() {
- NetworkChangeNotifier::RemoveObserver(this);
+ NetworkChangeNotifier::RemoveIPAddressObserver(this);
config_service_->RemoveObserver(this);
// Cancel any inprogress requests.
« no previous file with comments | « net/proxy/proxy_service.h ('k') | net/socket/client_socket_pool_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698