| Index: chrome/browser/extensions/api/networking_private/networking_private_api_nonchromeos.cc
|
| diff --git a/chrome/browser/extensions/api/networking_private/networking_private_api_nonchromeos.cc b/chrome/browser/extensions/api/networking_private/networking_private_api_nonchromeos.cc
|
| index 3dba76dbc61428765b563c4047978b9549bda3b9..6a1d3e6827fce97dc18d7d45828f851b6ff93b6a 100644
|
| --- a/chrome/browser/extensions/api/networking_private/networking_private_api_nonchromeos.cc
|
| +++ b/chrome/browser/extensions/api/networking_private/networking_private_api_nonchromeos.cc
|
| @@ -224,41 +224,17 @@ bool NetworkingPrivateGetVisibleNetworksFunction::RunImpl() {
|
| scoped_refptr<NetworkingPrivateProcessClient> process_client(
|
| NetworkingPrivateProcessClient::GetForProfile(profile_));
|
|
|
| - process_client->GetVisibleNetworks(base::Bind(
|
| - &NetworkingPrivateGetVisibleNetworksFunction::ResultCallback, this));
|
| + process_client->GetVisibleNetworks(
|
| + api::GetVisibleNetworks::Params::ToString(params->type),
|
| + base::Bind(&NetworkingPrivateGetVisibleNetworksFunction::ResultCallback,
|
| + this));
|
|
|
| return true;
|
| }
|
|
|
| void NetworkingPrivateGetVisibleNetworksFunction::ResultCallback(
|
| const base::ListValue& network_list) {
|
| - scoped_ptr<api::GetVisibleNetworks::Params> params =
|
| - api::GetVisibleNetworks::Params::Create(*args_);
|
| - ListValue* result = new ListValue();
|
| - std::string params_type =
|
| - api::GetVisibleNetworks::Params::ToString(params->type);
|
| - bool request_all = params->type == api::GetVisibleNetworks::Params::TYPE_ALL;
|
| -
|
| - // Copy networks of requested type;
|
| - for (base::ListValue::const_iterator it = network_list.begin();
|
| - it != network_list.end();
|
| - ++it) {
|
| - const base::Value* network_value = *it;
|
| - const DictionaryValue* network_dict = NULL;
|
| - if (!network_value->GetAsDictionary(&network_dict)) {
|
| - LOG(ERROR) << "Value is not a dictionary";
|
| - continue;
|
| - }
|
| - if (!request_all) {
|
| - std::string network_type;
|
| - network_dict->GetString(onc::network_config::kType, &network_type);
|
| - if (network_type != params_type)
|
| - continue;
|
| - }
|
| - result->Append(network_value->DeepCopy());
|
| - }
|
| -
|
| - SetResult(result);
|
| + SetResult(network_list.DeepCopy());
|
| SendResponse(true);
|
| }
|
|
|
|
|