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

Unified Diff: chromeos/network/onc/onc_translation_tables.cc

Issue 1033843003: Add NetworkTechnology types to ONC (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 9 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 | « chromeos/network/onc/onc_translation_tables.h ('k') | chromeos/network/onc/onc_translator_shill_to_onc.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/network/onc/onc_translation_tables.cc
diff --git a/chromeos/network/onc/onc_translation_tables.cc b/chromeos/network/onc/onc_translation_tables.cc
index 8c8fe9918cc202b79863e2a17aa2ff9fd324f3a6..a514527ee826c49ba03802a4764ba8cba6f3d1f1 100644
--- a/chromeos/network/onc/onc_translation_tables.cc
+++ b/chromeos/network/onc/onc_translation_tables.cc
@@ -167,7 +167,9 @@ const FieldTranslationEntry cellular_fields[] = {
// This field is converted during translation, see onc_translator_*.
// { ::onc::cellular::kActivationState, shill::kActivationStateProperty},
{::onc::vpn::kAutoConnect, shill::kAutoConnectProperty},
- {::onc::cellular::kNetworkTechnology, shill::kNetworkTechnologyProperty},
+ // This field is converted during translation, see onc_translator_*.
+ // { ::onc::cellular::kNetworkTechnology,
+ // shill::kNetworkTechnologyProperty},
// This field is converted during translation, see onc_translator_*.
// { ::onc::cellular::kRoamingState, shill::kRoamingStateProperty},
{::onc::cellular::kSignalStrength, shill::kSignalStrengthProperty},
@@ -314,6 +316,20 @@ const StringTranslationEntry kActivationStateTable[] = {
shill::kActivationStatePartiallyActivated},
{NULL}};
+const StringTranslationEntry kNetworkTechnologyTable[] = {
+ {::onc::cellular::kTechnologyCdma1Xrtt, shill::kNetworkTechnology1Xrtt},
+ {::onc::cellular::kTechnologyGsm, shill::kNetworkTechnologyGsm},
+ {::onc::cellular::kTechnologyEdge, shill::kNetworkTechnologyEdge},
+ {::onc::cellular::kTechnologyEvdo, shill::kNetworkTechnologyEvdo},
+ {::onc::cellular::kTechnologyGprs, shill::kNetworkTechnologyGprs},
+ {::onc::cellular::kTechnologyHspa, shill::kNetworkTechnologyHspa},
+ {::onc::cellular::kTechnologyHspaPlus, shill::kNetworkTechnologyHspaPlus},
+ {::onc::cellular::kTechnologyLte, shill::kNetworkTechnologyLte},
+ {::onc::cellular::kTechnologyLteAdvanced,
+ shill::kNetworkTechnologyLteAdvanced},
+ {::onc::cellular::kTechnologyUmts, shill::kNetworkTechnologyUmts},
+ {NULL}};
+
const StringTranslationEntry kRoamingStateTable[] = {
{::onc::cellular::kRoamingHome, shill::kRoamingStateHome},
{::onc::cellular::kRoamingRoaming, shill::kRoamingStateRoaming},
« no previous file with comments | « chromeos/network/onc/onc_translation_tables.h ('k') | chromeos/network/onc/onc_translator_shill_to_onc.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698