Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(61)

Unified Diff: net/base/net_util_linux.h

Issue 935333002: Update from https://crrev.com/316786 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/base/net_util.h ('k') | net/base/net_util_linux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/net_util_linux.h
diff --git a/net/base/net_util_linux.h b/net/base/net_util_linux.h
index fb5b6f44f9b563cf2af4758e2c6801ddd781000e..0b556bc08d1e6ba74bbd685b0388e203f20451c0 100644
--- a/net/base/net_util_linux.h
+++ b/net/base/net_util_linux.h
@@ -8,6 +8,8 @@
// This file is only used to expose some of the internals
// of net_util_linux.cc to address_tracker_linux and tests.
+#include <string>
+
#include "base/containers/hash_tables.h"
#include "net/base/address_tracker_linux.h"
#include "net/base/net_util.h"
@@ -17,6 +19,8 @@ namespace internal {
typedef char* (*GetInterfaceNameFunction)(int interface_index, char* ifname);
+typedef std::string (*GetInterfaceSSIDFunction)(const std::string& ifname);
+
NET_EXPORT bool GetNetworkListImpl(
NetworkInterfaceList* networks,
int policy,
@@ -24,6 +28,15 @@ NET_EXPORT bool GetNetworkListImpl(
const internal::AddressTrackerLinux::AddressMap& address_map,
GetInterfaceNameFunction get_interface_name);
+// Gets the current Wi-Fi SSID based on |interfaces|. Returns
+// empty string if there are no interfaces or if two interfaces have different
+// connection types. Otherwise returns the SSID of all interfaces if they have
+// the same SSID. This is adapted from
+// NetworkChangeNotifier::ConnectionTypeFromInterfaceList.
+NET_EXPORT std::string GetWifiSSIDFromInterfaceListInternal(
+ const NetworkInterfaceList& interfaces,
+ internal::GetInterfaceSSIDFunction get_interface_ssid);
+
} // namespace internal
} // namespace net
« no previous file with comments | « net/base/net_util.h ('k') | net/base/net_util_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698