Replace chrome://network implementation with networkConfig API

chrome/browser/ui/webui/chromeos/network_config_message_handler.cc

+// Copyright 2014 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 "chrome/browser/ui/webui/chromeos/network_config_message_handler.h"
+
+#include <string>
+
+#include "base/bind.h"
+#include "base/bind_helpers.h"
+#include "base/logging.h"
+#include "base/values.h"
+#include "chromeos/network/managed_network_configuration_handler.h"
+#include "chromeos/network/network_state.h"
+#include "chromeos/network/network_state_handler.h"
+#include "chromeos/network/onc/onc_signature.h"
+#include "chromeos/network/onc/onc_translator.h"
+#include "chromeos/network/onc/onc_utils.h"
+#include "chromeos/network/shill_property_util.h"
+#include "components/onc/onc_constants.h"
+#include "content/public/browser/web_ui.h"
+#include "third_party/cros_system_api/dbus/service_constants.h"
+
+namespace {
+
+void CopyStringFromDictionary(const std::string& key,

[pneubeck (no reviews), 2014/05/02 09:43:46]

unused

[stevenjb, 2014/05/02 22:07:38]

Done.

+                              const base::DictionaryValue& source,
+                              base::DictionaryValue* dest) {
+  std::string string_value;
+  if (source.GetStringWithoutPathExpansion(key, &string_value))
+    dest->SetStringWithoutPathExpansion(key, string_value);
+}
+
+}  // namespace
+
+namespace chromeos {
+
+NetworkConfigMessageHandler::NetworkConfigMessageHandler() {
+}
+
+NetworkConfigMessageHandler::~NetworkConfigMessageHandler() {
+}
+
+void NetworkConfigMessageHandler::RegisterMessages() {
+  web_ui()->RegisterMessageCallback(
+      "networkConfig.getVisibleNetworks",
+      base::Bind(&NetworkConfigMessageHandler::GetVisibleNetworks,
+                 base::Unretained(this)));
+  web_ui()->RegisterMessageCallback(
+      "networkConfig.getProperties",
+      base::Bind(&NetworkConfigMessageHandler::GetProperties,
+                 base::Unretained(this)));
+}
+
+void NetworkConfigMessageHandler::GetVisibleNetworks(
+    const base::ListValue* arg_list) const {
+  int callback_id;
+  std::string type;
+  if (!arg_list->GetInteger(0, &callback_id) ||
+      !arg_list->GetString(1, &type)) {
+    NOTREACHED();
+  }
+  base::ListValue return_arg_list;
+  return_arg_list.AppendInteger(callback_id);
+
+  NetworkTypePattern type_pattern = onc::NetworkTypePatternFromOncType(type);

[pneubeck (no reviews), 2014/05/02 09:43:46]

re Arman's question whether this could be shared with NetworkingPrivateAPI:

Could you move the inner implementation
chrome/browser/extensions/api/networking_private/networking_private_api_chromeos.cc:280-306
to a static function and share it?

[stevenjb, 2014/05/02 22:07:38]

Sure. Done.

+  NetworkStateHandler::NetworkStateList network_states;
+  NetworkHandler::Get()->network_state_handler()->GetNetworkListByType(
+      type_pattern, &network_states);
+
+  base::ListValue* network_state_list = new base::ListValue;
+  for (NetworkStateHandler::NetworkStateList::iterator it =
+           network_states.begin();
+       it != network_states.end(); ++it) {
+    base::DictionaryValue shill_dictionary;
+    (*it)->GetStateProperties(&shill_dictionary);
+    scoped_ptr<base::DictionaryValue> onc_network_part =
+        chromeos::onc::TranslateShillServiceToONCPart(
+            shill_dictionary, &chromeos::onc::kNetworkWithStateSignature);
+    onc_network_part->SetStringWithoutPathExpansion(
+        ::onc::network_config::kServicePath, (*it)->path());
+    network_state_list->Append(onc_network_part.release());
+  }
+  return_arg_list.Append(network_state_list);
+  InvokeCallback(return_arg_list);
+}
+
+void NetworkConfigMessageHandler::GetProperties(
+    const base::ListValue* arg_list) const {
+  int callback_id;
+  std::string guid;
+  if (!arg_list->GetInteger(0, &callback_id) ||
+      !arg_list->GetString(1, &guid)) {
+    NOTREACHED();
+  }
+  NetworkHandler::Get()->managed_network_configuration_handler()->GetProperties(
+      guid,
+      base::Bind(&NetworkConfigMessageHandler::GetPropertiesSuccess,
+                 base::Unretained(this), callback_id),
+      base::Bind(&NetworkConfigMessageHandler::ErrorCallback,
+                 base::Unretained(this), callback_id));
+}
+
+void NetworkConfigMessageHandler::GetPropertiesSuccess(
+    int callback_id,
+    const std::string& service_path,
+    const base::DictionaryValue& dictionary) const {
+  base::ListValue return_arg_list;
+  return_arg_list.AppendInteger(callback_id);
+
+  base::DictionaryValue* network_properties = dictionary.DeepCopy();
+  network_properties->SetStringWithoutPathExpansion(
+      ::onc::network_config::kGUID, service_path);
+  return_arg_list.Append(network_properties);
+  InvokeCallback(return_arg_list);
+}
+
+void NetworkConfigMessageHandler::InvokeCallback(
+    const base::ListValue& arg_list) const {
+  web_ui()->CallJavascriptFunction("networkConfig.chromeCallback", arg_list);
+}
+
+void NetworkConfigMessageHandler::ErrorCallback(
+    int callback_id,
+    const std::string& error_name,
+    scoped_ptr<base::DictionaryValue> error_data) const {
+  LOG(ERROR) << "NetworkConfigMessageHandler Error: " << error_name;
+  base::ListValue arg_list;
+  arg_list.AppendInteger(callback_id);
+  arg_list.AppendString(error_name);
+  web_ui()->CallJavascriptFunction("networkConfig.chromeError", arg_list);
+}
+
+}  // namespace chromeos