Commit 1410ab6c authored by Yuhong Sha's avatar Yuhong Sha Committed by Commit Bot

Change PepperNetworkMonitorHost to use NetworkChangeObserver

NetworkChangeNotifier::IPAddressObserver is being deprecated.
This CL migrates PepperNetworkMonitorHost to use NetworkChangeObserver
instead of the deprecated IPAddressObserver.

For more information, please see linked design doc in the bug below.

Bug: 754695
Signed-off-by: default avatarYuhong Sha <yuhong.sha@samsung.com>
Change-Id: I2b6e96a1b3a1fcc14edb096401041c28b3052ab1
Reviewed-on: https://chromium-review.googlesource.com/945186Reviewed-by: default avatarHelen Li <xunjieli@chromium.org>
Reviewed-by: default avatarRaymes Khoury <raymes@chromium.org>
Commit-Queue: Helen Li <xunjieli@chromium.org>
Cr-Commit-Position: refs/heads/master@{#544675}
parent fd4482ac
...@@ -64,10 +64,14 @@ PepperNetworkMonitorHost::PepperNetworkMonitorHost(BrowserPpapiHostImpl* host, ...@@ -64,10 +64,14 @@ PepperNetworkMonitorHost::PepperNetworkMonitorHost(BrowserPpapiHostImpl* host,
} }
PepperNetworkMonitorHost::~PepperNetworkMonitorHost() { PepperNetworkMonitorHost::~PepperNetworkMonitorHost() {
net::NetworkChangeNotifier::RemoveIPAddressObserver(this); net::NetworkChangeNotifier::RemoveNetworkChangeObserver(this);
} }
void PepperNetworkMonitorHost::OnIPAddressChanged() { GetAndSendNetworkList(); } void PepperNetworkMonitorHost::OnNetworkChanged(
net::NetworkChangeNotifier::ConnectionType type) {
if (type == net::NetworkChangeNotifier::GetConnectionType())
GetAndSendNetworkList();
}
void PepperNetworkMonitorHost::OnPermissionCheckResult( void PepperNetworkMonitorHost::OnPermissionCheckResult(
bool can_use_network_monitor) { bool can_use_network_monitor) {
...@@ -77,7 +81,7 @@ void PepperNetworkMonitorHost::OnPermissionCheckResult( ...@@ -77,7 +81,7 @@ void PepperNetworkMonitorHost::OnPermissionCheckResult(
return; return;
} }
net::NetworkChangeNotifier::AddIPAddressObserver(this); net::NetworkChangeNotifier::AddNetworkChangeObserver(this);
GetAndSendNetworkList(); GetAndSendNetworkList();
} }
......
...@@ -21,7 +21,7 @@ class BrowserPpapiHostImpl; ...@@ -21,7 +21,7 @@ class BrowserPpapiHostImpl;
// The host for PPB_NetworkMonitor. This class lives on the IO thread. // The host for PPB_NetworkMonitor. This class lives on the IO thread.
class CONTENT_EXPORT PepperNetworkMonitorHost class CONTENT_EXPORT PepperNetworkMonitorHost
: public ppapi::host::ResourceHost, : public ppapi::host::ResourceHost,
public net::NetworkChangeNotifier::IPAddressObserver { public net::NetworkChangeNotifier::NetworkChangeObserver {
public: public:
PepperNetworkMonitorHost(BrowserPpapiHostImpl* host, PepperNetworkMonitorHost(BrowserPpapiHostImpl* host,
PP_Instance instance, PP_Instance instance,
...@@ -29,8 +29,9 @@ class CONTENT_EXPORT PepperNetworkMonitorHost ...@@ -29,8 +29,9 @@ class CONTENT_EXPORT PepperNetworkMonitorHost
~PepperNetworkMonitorHost() override; ~PepperNetworkMonitorHost() override;
// net::NetworkChangeNotifier::IPAddressObserver interface. // net::NetworkChangeNotifier::NetworkChangeObserver interface.
void OnIPAddressChanged() override; void OnNetworkChanged(
net::NetworkChangeNotifier::ConnectionType type) override;
private: private:
void OnPermissionCheckResult(bool can_use_network_monitor); void OnPermissionCheckResult(bool can_use_network_monitor);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment