Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / chromeos / network / managed_state.cc

diff --git a/src/chromeos/network/managed_state.cc b/src/chromeos/network/managed_state.cc
index b4f77fb..4bbece8 100644 (file)
--- a/src/chromeos/network/managed_state.cc
+++ b/src/chromeos/network/managed_state.cc
@@ -19,6 +19,19 @@ bool ManagedState::Matches(const NetworkTypePattern& pattern) const {
   return pattern.MatchesType(type());
 }
 
+// static
+std::string ManagedState::TypeToString(ManagedType type) {
+  switch (type) {
+    case MANAGED_TYPE_NETWORK:
+      return "Network";
+    case MANAGED_TYPE_FAVORITE:
+      return "Favorite";
+    case MANAGED_TYPE_DEVICE:
+      return "Device";
+  }
+  return "Unknown";
+}
+
 ManagedState::ManagedState(ManagedType type, const std::string& path)
     : managed_type_(type),
       path_(path),
@@ -64,6 +77,11 @@ bool ManagedState::InitialPropertiesReceived(
   return false;
 }
 
+void ManagedState::GetStateProperties(base::DictionaryValue* dictionary) const {
+  dictionary->SetStringWithoutPathExpansion(shill::kNameProperty, name());
+  dictionary->SetStringWithoutPathExpansion(shill::kTypeProperty, type());
+}
+
 bool ManagedState::ManagedStatePropertyChanged(const std::string& key,
                                                const base::Value& value) {
   if (key == shill::kNameProperty) {
@@ -107,7 +125,7 @@ bool ManagedState::GetStringValue(const std::string& key,
                                   std::string* out_value) {
   std::string new_value;
   if (!value.GetAsString(&new_value)) {
-    NET_LOG_ERROR("Error parsing state value", path() + "." + key);
+    NET_LOG_ERROR("Error parsing state: " + key, path());
     return false;
   }
   if (*out_value == new_value)