Add additional cellular-related properties to Network|DeviceState

chromeos/network/network_state.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chromeos/network/network_state.h"
 
 #include "base/i18n/icu_encoding_detection.h"
 #include "base/i18n/icu_string_conversions.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
@@ skipping 140 matching lines @@
   } else if (key == flimflam::kDeviceProperty) {
     return GetStringValue(key, value, &device_path_);
   } else if (key == flimflam::kGuidProperty) {
     return GetStringValue(key, value, &guid_);
   } else if (key == flimflam::kProfileProperty) {
     return GetStringValue(key, value, &profile_path_);
   } else if (key == shill::kActivateOverNonCellularNetworkProperty) {
     return GetBooleanValue(key, value, &activate_over_non_cellular_networks_);
   } else if (key == shill::kOutOfCreditsProperty) {
     return GetBooleanValue(key, value, &cellular_out_of_credits_);
+  } else if (key == flimflam::kUsageURLProperty) {
+    return GetStringValue(key, value, &usage_url_);
+  } else if (key == flimflam::kPaymentPortalProperty) {
+    const DictionaryValue& dict = static_cast<const DictionaryValue&>(value);
+    if (!dict.GetStringWithoutPathExpansion(flimflam::kPaymentPortalURL,
+                                            &payment_url_))
+      return false;
+    if (!dict.GetStringWithoutPathExpansion(flimflam::kPaymentPortalMethod,
+                                            &post_method_))
+      return false;
+    if (!dict.GetStringWithoutPathExpansion(flimflam::kPaymentPortalPostData,
+                                            &post_data_))
+      return false;
+    return true;
   } else if (key == flimflam::kWifiHexSsid) {
     return GetStringValue(key, value, &hex_ssid_);
   } else if (key == flimflam::kCountryProperty) {
     // TODO(stevenjb): This is currently experimental. If we find a case where
     // base::DetectEncoding() fails in UpdateName(), where country_code_ is
     // set, figure out whether we can use country_code_ with ConvertToUtf8().
     // crbug.com/233267.
     return GetStringValue(key, value, &country_code_);
   }
   return false;
@@ skipping 52 matching lines @@
   dictionary->SetStringWithoutPathExpansion(flimflam::kDeviceProperty,
                                             device_path_);
   dictionary->SetStringWithoutPathExpansion(flimflam::kGuidProperty, guid_);
   dictionary->SetStringWithoutPathExpansion(flimflam::kProfileProperty,
                                             profile_path_);
   dictionary->SetBooleanWithoutPathExpansion(
       shill::kActivateOverNonCellularNetworkProperty,
       activate_over_non_cellular_networks_);
   dictionary->SetBooleanWithoutPathExpansion(shill::kOutOfCreditsProperty,
                                              cellular_out_of_credits_);
+  base::DictionaryValue* payment_portal_properties = new DictionaryValue;
+  payment_portal_properties->SetStringWithoutPathExpansion(
+      flimflam::kPaymentPortalURL,
+      payment_url_);
+  payment_portal_properties->SetStringWithoutPathExpansion(
+      flimflam::kPaymentPortalMethod,
+      post_method_);
+  payment_portal_properties->SetStringWithoutPathExpansion(
+      flimflam::kPaymentPortalPostData,
+      post_data_);
+  dictionary->SetWithoutPathExpansion(flimflam::kPaymentPortalProperty,
+                                      payment_portal_properties);
 }
 
 void NetworkState::GetConfigProperties(
     base::DictionaryValue* dictionary) const {
   dictionary->SetStringWithoutPathExpansion(flimflam::kNameProperty, name());
   dictionary->SetStringWithoutPathExpansion(flimflam::kTypeProperty, type());
   dictionary->SetStringWithoutPathExpansion(flimflam::kSecurityProperty,
                                             security());
   dictionary->SetStringWithoutPathExpansion(flimflam::kGuidProperty, guid());
 }
@@ skipping 87 matching lines @@
           connection_state == flimflam::kStateConfiguration ||
           connection_state == flimflam::kStateCarrier);
 }
 
 // static
 std::string NetworkState::IPConfigProperty(const char* key) {
   return base::StringPrintf("%s.%s", shill::kIPConfigProperty, key);
 }
 
 }  // namespace chromeos