diff options
| author | martijn <martijn@martijnc.be> | 2016-03-03 11:49:26 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-03 19:50:15 +0000 |
| commit | 6e03065cee6ad249a6b8b14e9f690ee6efb86703 (patch) | |
| tree | 648efd10258f3cc96ea279e5eb9261193fc59a3a /extensions/browser/api | |
| parent | 8bb1f7eba92e0353d7223b11a07b442f3fa449f4 (diff) | |
| download | chromium_src-6e03065cee6ad249a6b8b14e9f690ee6efb86703.zip chromium_src-6e03065cee6ad249a6b8b14e9f690ee6efb86703.tar.gz chromium_src-6e03065cee6ad249a6b8b14e9f690ee6efb86703.tar.bz2 | |
Migrate net::NetworkInterface to net::IPAddress.
Also adds a new constructor that takes an IPAddress and deprecates the constructor that takes an IPAddressNumber.
BUG=496258
Review URL: https://codereview.chromium.org/1735983003
Cr-Commit-Position: refs/heads/master@{#379064}
Diffstat (limited to 'extensions/browser/api')
| -rw-r--r-- | extensions/browser/api/socket/socket_api.cc | 2 | ||||
| -rw-r--r-- | extensions/browser/api/system_network/system_network_api.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/extensions/browser/api/socket/socket_api.cc b/extensions/browser/api/socket/socket_api.cc index 88b2a83..5ca184c 100644 --- a/extensions/browser/api/socket/socket_api.cc +++ b/extensions/browser/api/socket/socket_api.cc @@ -800,7 +800,7 @@ void SocketGetNetworkListFunction::SendResponseOnUIThread( linked_ptr<api::socket::NetworkInterface> info = make_linked_ptr(new api::socket::NetworkInterface); info->name = i->name; - info->address = net::IPAddressToString(i->address); + info->address = i->address.ToString(); info->prefix_length = i->prefix_length; create_arg.push_back(info); } diff --git a/extensions/browser/api/system_network/system_network_api.cc b/extensions/browser/api/system_network/system_network_api.cc index b6b6685..0cf8d0a 100644 --- a/extensions/browser/api/system_network/system_network_api.cc +++ b/extensions/browser/api/system_network/system_network_api.cc @@ -70,7 +70,7 @@ void SystemNetworkGetNetworkInterfacesFunction::SendResponseOnUIThread( linked_ptr<api::system_network::NetworkInterface> info = make_linked_ptr(new api::system_network::NetworkInterface); info->name = i->name; - info->address = net::IPAddressToString(i->address); + info->address = i->address.ToString(); info->prefix_length = i->prefix_length; create_arg.push_back(info); } |