summaryrefslogtreecommitdiff
path: root/chromium/net/base/network_interfaces.h
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2016-05-09 14:22:11 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2016-05-09 15:11:45 +0000
commit2ddb2d3e14eef3de7dbd0cef553d669b9ac2361c (patch)
treee75f511546c5fd1a173e87c1f9fb11d7ac8d1af3 /chromium/net/base/network_interfaces.h
parenta4f3d46271c57e8155ba912df46a05559d14726e (diff)
downloadqtwebengine-chromium-2ddb2d3e14eef3de7dbd0cef553d669b9ac2361c.tar.gz
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 <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'chromium/net/base/network_interfaces.h')
-rw-r--r--chromium/net/base/network_interfaces.h10
1 files changed, 7 insertions, 3 deletions
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<ScopedWifiOptions> 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_