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

Unified Diff: net/base/network_change_notifier.cc

Issue 1306423004: [NetInfo] Browser changes to support connection.downlinkMax (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Minor browser test fix Created 5 years, 3 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') | no next file » | 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 2c9737bcf67c2df971a69da586a48d879a7d53f6..4c1dd68968405dc344f74371f6bb0f1e9eb71374 100644
--- a/net/base/network_change_notifier.cc
+++ b/net/base/network_change_notifier.cc
@@ -556,6 +556,81 @@ void NetworkChangeNotifier::GetMaxBandwidthAndConnectionType(
}
// static
+double NetworkChangeNotifier::GetMaxBandwidthForConnectionSubtype(
+ ConnectionSubtype subtype) {
+ switch (subtype) {
+ case SUBTYPE_GSM:
+ return 0.01;
+ case SUBTYPE_IDEN:
+ return 0.064;
+ case SUBTYPE_CDMA:
+ return 0.115;
+ case SUBTYPE_1XRTT:
+ return 0.153;
+ case SUBTYPE_GPRS:
+ return 0.237;
+ case SUBTYPE_EDGE:
+ return 0.384;
+ case SUBTYPE_UMTS:
+ return 2.0;
+ case SUBTYPE_EVDO_REV_0:
+ return 2.46;
+ case SUBTYPE_EVDO_REV_A:
+ return 3.1;
+ case SUBTYPE_HSPA:
+ return 3.6;
+ case SUBTYPE_EVDO_REV_B:
+ return 14.7;
+ case SUBTYPE_HSDPA:
+ return 14.3;
+ case SUBTYPE_HSUPA:
+ return 14.4;
+ case SUBTYPE_EHRPD:
+ return 21.0;
+ case SUBTYPE_HSPAP:
+ return 42.0;
+ case SUBTYPE_LTE:
+ return 100.0;
+ case SUBTYPE_LTE_ADVANCED:
+ return 100.0;
+ case SUBTYPE_BLUETOOTH_1_2:
+ return 1.0;
+ case SUBTYPE_BLUETOOTH_2_1:
+ return 3.0;
+ case SUBTYPE_BLUETOOTH_3_0:
+ return 24.0;
+ case SUBTYPE_BLUETOOTH_4_0:
+ return 1.0;
+ case SUBTYPE_ETHERNET:
+ return 10.0;
+ case SUBTYPE_FAST_ETHERNET:
+ return 100.0;
+ case SUBTYPE_GIGABIT_ETHERNET:
+ return 1000.0;
+ case SUBTYPE_10_GIGABIT_ETHERNET:
+ return 10000.0;
+ case SUBTYPE_WIFI_B:
+ return 11.0;
+ case SUBTYPE_WIFI_G:
+ return 54.0;
+ case SUBTYPE_WIFI_N:
+ return 600.0;
+ case SUBTYPE_WIFI_AC:
+ return 1300.0;
+ case SUBTYPE_WIFI_AD:
+ return 7000.0;
+ case SUBTYPE_UNKNOWN:
+ return std::numeric_limits<double>::infinity();
+ case SUBTYPE_NONE:
+ return 0.0;
+ case SUBTYPE_OTHER:
+ return std::numeric_limits<double>::infinity();
+ }
+ NOTREACHED();
+ return std::numeric_limits<double>::infinity();
+}
+
+// static
void NetworkChangeNotifier::GetDnsConfig(DnsConfig* config) {
if (!g_network_change_notifier) {
*config = DnsConfig();
@@ -861,81 +936,6 @@ void NetworkChangeNotifier::GetCurrentMaxBandwidthAndConnectionType(
}
// static
-double NetworkChangeNotifier::GetMaxBandwidthForConnectionSubtype(
- ConnectionSubtype subtype) {
- switch (subtype) {
- case SUBTYPE_GSM:
- return 0.01;
- case SUBTYPE_IDEN:
- return 0.064;
- case SUBTYPE_CDMA:
- return 0.115;
- case SUBTYPE_1XRTT:
- return 0.153;
- case SUBTYPE_GPRS:
- return 0.237;
- case SUBTYPE_EDGE:
- return 0.384;
- case SUBTYPE_UMTS:
- return 2.0;
- case SUBTYPE_EVDO_REV_0:
- return 2.46;
- case SUBTYPE_EVDO_REV_A:
- return 3.1;
- case SUBTYPE_HSPA:
- return 3.6;
- case SUBTYPE_EVDO_REV_B:
- return 14.7;
- case SUBTYPE_HSDPA:
- return 14.3;
- case SUBTYPE_HSUPA:
- return 14.4;
- case SUBTYPE_EHRPD:
- return 21.0;
- case SUBTYPE_HSPAP:
- return 42.0;
- case SUBTYPE_LTE:
- return 100.0;
- case SUBTYPE_LTE_ADVANCED:
- return 100.0;
- case SUBTYPE_BLUETOOTH_1_2:
- return 1.0;
- case SUBTYPE_BLUETOOTH_2_1:
- return 3.0;
- case SUBTYPE_BLUETOOTH_3_0:
- return 24.0;
- case SUBTYPE_BLUETOOTH_4_0:
- return 1.0;
- case SUBTYPE_ETHERNET:
- return 10.0;
- case SUBTYPE_FAST_ETHERNET:
- return 100.0;
- case SUBTYPE_GIGABIT_ETHERNET:
- return 1000.0;
- case SUBTYPE_10_GIGABIT_ETHERNET:
- return 10000.0;
- case SUBTYPE_WIFI_B:
- return 11.0;
- case SUBTYPE_WIFI_G:
- return 54.0;
- case SUBTYPE_WIFI_N:
- return 600.0;
- case SUBTYPE_WIFI_AC:
- return 1300.0;
- case SUBTYPE_WIFI_AD:
- return 7000.0;
- case SUBTYPE_UNKNOWN:
- return std::numeric_limits<double>::infinity();
- case SUBTYPE_NONE:
- return 0.0;
- case SUBTYPE_OTHER:
- return std::numeric_limits<double>::infinity();
- }
- NOTREACHED();
- return std::numeric_limits<double>::infinity();
-}
-
-// static
void NetworkChangeNotifier::NotifyObserversOfIPAddressChange() {
if (g_network_change_notifier &&
!NetworkChangeNotifier::test_notifications_only_) {
« no previous file with comments | « net/base/network_change_notifier.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698