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

Unified Diff: net/spdy/spdy_session_pool.cc

Issue 11620007: Switch from OnIPAddressChanged and OnConnectionTypeChange to OnNetworkChanged Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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
Index: net/spdy/spdy_session_pool.cc
diff --git a/net/spdy/spdy_session_pool.cc b/net/spdy/spdy_session_pool.cc
index b967a463caa3fde9a1e28c7e84f1fbafe7a23f82..5f1a8cc8c6b187c38b006fd85985e882f7d541f6 100644
--- a/net/spdy/spdy_session_pool.cc
+++ b/net/spdy/spdy_session_pool.cc
@@ -73,7 +73,7 @@ SpdySessionPool::SpdySessionPool(
time_func_(time_func),
trusted_spdy_proxy_(
HostPortPair::FromString(trusted_spdy_proxy)) {
- NetworkChangeNotifier::AddIPAddressObserver(this);
+ NetworkChangeNotifier::AddNetworkChangeObserver(this);
if (ssl_config_service_)
ssl_config_service_->AddObserver(this);
CertDatabase::GetInstance()->AddObserver(this);
@@ -84,7 +84,7 @@ SpdySessionPool::~SpdySessionPool() {
if (ssl_config_service_)
ssl_config_service_->RemoveObserver(this);
- NetworkChangeNotifier::RemoveIPAddressObserver(this);
+ NetworkChangeNotifier::RemoveNetworkChangeObserver(this);
CertDatabase::GetInstance()->RemoveObserver(this);
}
@@ -274,9 +274,12 @@ Value* SpdySessionPool::SpdySessionPoolInfoToValue() const {
return list;
}
-void SpdySessionPool::OnIPAddressChanged() {
- CloseCurrentSessions(ERR_NETWORK_CHANGED);
- http_server_properties_->ClearSpdySettings();
+void SpdySessionPool::OnNetworkChanged(
+ net::NetworkChangeNotifier::ConnectionType type) {
+ if (type == net::NetworkChangeNotifier::CONNECTION_NONE) {
+ CloseCurrentSessions(ERR_NETWORK_CHANGED);
+ http_server_properties_->ClearSpdySettings();
+ }
}
void SpdySessionPool::OnSSLConfigChanged() {

Powered by Google App Engine
This is Rietveld 408576698