From 2ddb2d3e14eef3de7dbd0cef553d669b9ac2361c Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 9 May 2016 14:22:11 +0200 Subject: BASELINE: Update Chromium to 51.0.2704.41 Also adds in all smaller components by reversing logic for exclusion. Change-Id: Ibf90b506e7da088ea2f65dcf23f2b0992c504422 Reviewed-by: Joerg Bornemann --- chromium/net/base/network_interfaces.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'chromium/net/base/network_interfaces.h') diff --git a/chromium/net/base/network_interfaces.h b/chromium/net/base/network_interfaces.h index ed98abb5d84..84edcfb8241 100644 --- a/chromium/net/base/network_interfaces.h +++ b/chromium/net/base/network_interfaces.h @@ -12,7 +12,7 @@ #include "base/macros.h" #include "base/memory/scoped_ptr.h" -#include "net/base/ip_address_number.h" +#include "net/base/ip_address.h" #include "net/base/net_export.h" #include "net/base/network_change_notifier.h" @@ -44,16 +44,17 @@ struct NET_EXPORT NetworkInterface { const std::string& friendly_name, uint32_t interface_index, NetworkChangeNotifier::ConnectionType type, - const IPAddressNumber& address, + const IPAddress& address, uint32_t prefix_length, int ip_address_attributes); + NetworkInterface(const NetworkInterface& other); ~NetworkInterface(); std::string name; std::string friendly_name; // Same as |name| on non-Windows. uint32_t interface_index; // Always 0 on Android. NetworkChangeNotifier::ConnectionType type; - IPAddressNumber address; + IPAddress address; uint32_t prefix_length; int ip_address_attributes; // Combination of |IPAddressAttributes|. }; @@ -122,6 +123,9 @@ class NET_EXPORT ScopedWifiOptions { // is freed. Currently only available on Windows. NET_EXPORT scoped_ptr SetWifiOptions(int options); +// Returns the hostname of the current system. Returns empty string on failure. +NET_EXPORT std::string GetHostName(); + } // namespace net #endif // NET_BASE_NETWORK_INTERFACES_H_ -- cgit v1.2.1