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

Unified Diff: net/base/network_change_notifier.cc

Issue 895853003: Update from https://crrev.com/314320 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 11 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/network_change_notifier.h ('k') | net/base/network_change_notifier_linux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/network_change_notifier.cc
diff --git a/net/base/network_change_notifier.cc b/net/base/network_change_notifier.cc
index 2e573dca32b97edd0619f672e2e22b166cd8c95e..ec45a4e2ea458e0887e0fcad68bf56bf29c1d1a0 100644
--- a/net/base/network_change_notifier.cc
+++ b/net/base/network_change_notifier.cc
@@ -655,6 +655,27 @@ bool NetworkChangeNotifier::IsConnectionCellular(ConnectionType type) {
}
// static
+NetworkChangeNotifier::ConnectionType
+NetworkChangeNotifier::ConnectionTypeFromInterfaceList(
+ const NetworkInterfaceList& interfaces) {
+ bool first = true;
+ ConnectionType result = CONNECTION_NONE;
+ for (size_t i = 0; i < interfaces.size(); ++i) {
+#if defined(OS_WIN)
+ if (interfaces[i].friendly_name == "Teredo Tunneling Pseudo-Interface")
+ continue;
+#endif
+ if (first) {
+ first = false;
+ result = interfaces[i].type;
+ } else if (result != interfaces[i].type) {
+ return CONNECTION_UNKNOWN;
+ }
+ }
+ return result;
+}
+
+// static
NetworkChangeNotifier* NetworkChangeNotifier::CreateMock() {
return new MockNetworkChangeNotifier();
}
« no previous file with comments | « net/base/network_change_notifier.h ('k') | net/base/network_change_notifier_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698