namespace wifi {
+const char WiFiService::kErrorAssociateToNetwork[] = "Error.AssociateToNetwork";
+const char WiFiService::kErrorInvalidData[] = "Error.InvalidData";
+const char WiFiService::kErrorNotConfigured[] ="Error.NotConfigured";
+const char WiFiService::kErrorNotConnected[] = "Error.NotConnected";
+const char WiFiService::kErrorNotFound[] = "Error.NotFound";
+const char WiFiService::kErrorNotImplemented[] = "Error.NotImplemented";
+const char WiFiService::kErrorScanForNetworksWithName[] =
+ "Error.ScanForNetworksWithName";
+const char WiFiService::kErrorWiFiService[] = "Error.WiFiService";
+
WiFiService::NetworkProperties::NetworkProperties()
: connection_state(onc::connection_state::kNotConnected),
security(onc::wifi::kNone),
value->SetString(onc::network_config::kGUID, guid);
value->SetString(onc::network_config::kName, name);
value->SetString(onc::network_config::kConnectionState, connection_state);
+ DCHECK(type == onc::network_type::kWiFi);
value->SetString(onc::network_config::kType, type);
- if (type == onc::network_type::kWiFi) {
- scoped_ptr<base::DictionaryValue> wifi(new base::DictionaryValue());
- wifi->SetString(onc::wifi::kSecurity, security);
- wifi->SetInteger(onc::wifi::kSignalStrength, signal_strength);
-
- // Network list expects subset of data.
- if (!network_list) {
- if (frequency != WiFiService::kFrequencyUnknown)
- wifi->SetInteger(onc::wifi::kFrequency, frequency);
- scoped_ptr<base::ListValue> frequency_list(new base::ListValue());
- for (FrequencySet::const_iterator it = this->frequency_set.begin();
- it != this->frequency_set.end();
- ++it) {
- frequency_list->AppendInteger(*it);
- }
- if (!frequency_list->empty())
- wifi->Set(onc::wifi::kFrequencyList, frequency_list.release());
- if (!bssid.empty())
- wifi->SetString(onc::wifi::kBSSID, bssid);
- wifi->SetString(onc::wifi::kSSID, ssid);
- }
- value->Set(onc::network_type::kWiFi, wifi.release());
- } else {
- // Add properites from json extra if present.
- if (!json_extra.empty()) {
- base::Value* value_extra = base::JSONReader::Read(json_extra);
- value->Set(type, value_extra);
+ // For now, assume all WiFi services are connectable.
+ value->SetBoolean(onc::network_config::kConnectable, true);
+
+ scoped_ptr<base::DictionaryValue> wifi(new base::DictionaryValue());
+ wifi->SetString(onc::wifi::kSecurity, security);
+ wifi->SetInteger(onc::wifi::kSignalStrength, signal_strength);
+
+ // Network list expects subset of data.
+ if (!network_list) {
+ if (frequency != WiFiService::kFrequencyUnknown)
+ wifi->SetInteger(onc::wifi::kFrequency, frequency);
+ scoped_ptr<base::ListValue> frequency_list(new base::ListValue());
+ for (FrequencySet::const_iterator it = this->frequency_set.begin();
+ it != this->frequency_set.end();
+ ++it) {
+ frequency_list->AppendInteger(*it);
}
+ if (!frequency_list->empty())
+ wifi->Set(onc::wifi::kFrequencyList, frequency_list.release());
+ if (!bssid.empty())
+ wifi->SetString(onc::wifi::kBSSID, bssid);
+ wifi->SetString(onc::wifi::kSSID, ssid);
}
+ value->Set(onc::network_type::kWiFi, wifi.release());
+
+ if (!network_list && !json_extra.empty()) {
+ base::Value* value_extra = base::JSONReader::Read(json_extra);
+ CHECK(value_extra);
+ base::DictionaryValue* value_dictionary;
+ if (value_extra->GetAsDictionary(&value_dictionary))
+ value->MergeDictionary(value_dictionary);
+ }
+
return value.Pass();
}