Chromium Code Reviews| Index: content/browser/renderer_host/pepper/pepper_message_filter.cc |
| diff --git a/content/browser/renderer_host/pepper/pepper_message_filter.cc b/content/browser/renderer_host/pepper/pepper_message_filter.cc |
| index 648b3a31470c76bb5e802dcff7b92efacd7829fb..a08b8332eaa21dee60ea78594e838886776d8eb1 100644 |
| --- a/content/browser/renderer_host/pepper/pepper_message_filter.cc |
| +++ b/content/browser/renderer_host/pepper/pepper_message_filter.cc |
| @@ -183,8 +183,10 @@ bool PepperMessageFilter::OnMessageReceived(const IPC::Message& msg, |
| return handled; |
| } |
| -void PepperMessageFilter::OnIPAddressChanged() { |
| - GetAndSendNetworkList(); |
| +void PepperMessageFilter::OnNetworkChanged( |
| + net::NetworkChangeNotifier::ConnectionType type) { |
| + if (type == net::NetworkChangeNotifier::CONNECTION_NONE) |
|
szym
2013/01/20 06:52:08
Are you sure this should be done during the destru
|
| + GetAndSendNetworkList(); |
| } |
| net::HostResolver* PepperMessageFilter::GetHostResolver() { |
| @@ -232,7 +234,7 @@ void PepperMessageFilter::RemoveTCPServerSocket(uint32 socket_id) { |
| PepperMessageFilter::~PepperMessageFilter() { |
| if (!network_monitor_ids_.empty()) |
| - net::NetworkChangeNotifier::RemoveIPAddressObserver(this); |
| + net::NetworkChangeNotifier::RemoveNetworkChangeObserver(this); |
| } |
| void PepperMessageFilter::OnTCPCreate(int32 routing_id, |
| @@ -661,7 +663,7 @@ void PepperMessageFilter::OnNetworkMonitorStart(uint32 plugin_dispatcher_id) { |
| return; |
| if (network_monitor_ids_.empty()) |
| - net::NetworkChangeNotifier::AddIPAddressObserver(this); |
| + net::NetworkChangeNotifier::AddNetworkChangeObserver(this); |
| network_monitor_ids_.insert(plugin_dispatcher_id); |
| GetAndSendNetworkList(); |
| @@ -675,7 +677,7 @@ void PepperMessageFilter::OnNetworkMonitorStop(uint32 plugin_dispatcher_id) { |
| network_monitor_ids_.erase(plugin_dispatcher_id); |
| if (network_monitor_ids_.empty()) |
| - net::NetworkChangeNotifier::RemoveIPAddressObserver(this); |
| + net::NetworkChangeNotifier::RemoveNetworkChangeObserver(this); |
| } |
| void PepperMessageFilter::OnX509CertificateParseDER( |