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

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

Issue 2847453002: [CrOS Tether] Remove the ManagedTetherProperties dictionary. (Closed)
Patch Set: Created 3 years, 8 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
Index: chromeos/network/onc/onc_signature.cc
diff --git a/chromeos/network/onc/onc_signature.cc b/chromeos/network/onc/onc_signature.cc
index b2c4cd561c2712221255c9eaf50985152235f8ad..7da1bc5f9259ca58fa16cb900bd2eef624c6c4bc 100644
--- a/chromeos/network/onc/onc_signature.cc
+++ b/chromeos/network/onc/onc_signature.cc
@@ -166,7 +166,9 @@ const OncFieldSignature ethernet_fields[] = {
{::onc::ethernet::kEAP, &kEAPSignature},
{NULL}};
-const OncFieldSignature tether_fields[] = {
+const OncFieldSignature tether_fields[] = {{NULL}};
+
+const OncFieldSignature tether_with_state_fields[] = {
{::onc::tether::kBatteryPercentage, &kIntegerSignature},
{::onc::tether::kCarrier, &kStringSignature},
{::onc::tether::kSignalStrength, &kIntegerSignature},
@@ -335,7 +337,7 @@ const OncFieldSignature network_with_state_fields[] = {
{::onc::network_config::kRestrictedConnectivity, &kBoolSignature},
{::onc::network_config::kSavedIPConfig, &kSavedIPConfigSignature},
{::onc::network_config::kSource, &kStringSignature},
- {::onc::network_config::kTether, &kTetherSignature},
+ {::onc::network_config::kTether, &kTetherWithStateSignature},
{::onc::network_config::kWiFi, &kWiFiWithStateSignature},
{::onc::network_config::kWimax, &kWiMAXWithStateSignature},
{NULL}};
@@ -400,8 +402,6 @@ const OncValueSignature kVPNSignature = {base::Value::Type::DICTIONARY,
vpn_fields, NULL};
const OncValueSignature kEthernetSignature = {base::Value::Type::DICTIONARY,
ethernet_fields, NULL};
-const OncValueSignature kTetherSignature = {base::Value::Type::DICTIONARY,
- tether_fields, NULL};
const OncValueSignature kIPConfigSignature = {base::Value::Type::DICTIONARY,
ipconfig_fields, NULL};
const OncValueSignature kSavedIPConfigSignature = {
@@ -438,6 +438,11 @@ const OncValueSignature kNetworkWithStateSignature = {
const OncValueSignature kWiFiWithStateSignature = {
base::Value::Type::DICTIONARY, wifi_with_state_fields, NULL,
&kWiFiSignature};
+const OncValueSignature kTetherSignature = {base::Value::Type::DICTIONARY,
+ tether_fields, NULL};
+const OncValueSignature kTetherWithStateSignature = {
+ base::Value::Type::DICTIONARY, tether_with_state_fields, NULL,
+ &kTetherSignature};
const OncValueSignature kWiMAXWithStateSignature = {
base::Value::Type::DICTIONARY, wimax_with_state_fields, NULL,
&kWiMAXSignature};

Powered by Google App Engine
This is Rietveld 408576698