This adds a private extension API to use for simple networking

chrome/browser/chromeos/extensions/networking_private_api.cc

Index: chrome/browser/chromeos/extensions/networking_private_api.cc
diff --git a/chrome/browser/chromeos/extensions/networking_private_api.cc b/chrome/browser/chromeos/extensions/networking_private_api.cc
new file mode 100644
index 0000000000000000000000000000000000000000..c13877f7cf69338df55019ee0122f4b2bd012aff
--- /dev/null
+++ b/chrome/browser/chromeos/extensions/networking_private_api.cc
@@ -0,0 +1,302 @@
+// Copyright (c) 2013 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/chromeos/extensions/networking_private_api.h"
+
+#include "base/bind_helpers.h"
+#include "chrome/browser/extensions/extension_function_registry.h"
+#include "chrome/common/extensions/api/networking_private.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/dbus/shill_manager_client.h"
+#include "chromeos/dbus/shill_service_client.h"
+#include "chromeos/network/onc/onc_constants.h"
+#include "chromeos/network/onc/onc_signature.h"
+#include "chromeos/network/onc/onc_translation_tables.h"
+#include "chromeos/network/onc/onc_translator.h"
+#include "dbus/object_path.h"
+#include "third_party/cros_system_api/dbus/service_constants.h"
+
+using namespace chromeos;
+namespace api = extensions::api::networking_private;
+
+namespace {
+
+// An error returned when no valid services were found.
+const char kInvalidResponseError[] = "Error.invalidResponse";
+
+// This creates a new ONC dictionary that only contains the information we're
+// interested in passing on to JavaScript.
+scoped_ptr<api::NetworkProperties> CreateFilteredResult(
+    const base::DictionaryValue& properties) {
+  scoped_ptr<base::DictionaryValue> onc_properties(
+      onc::TranslateShillServiceToONCPart(
+          properties,
+          &onc::kNetworkConfigurationSignature));
+
+  // Now we filter it so we only include properties that we care about for this
+  // interface.
+  static const char* const desired_fields[] = {
+      onc::network_config::kWiFi,
+      onc::network_config::kName,
+      onc::network_config::kGUID,
+      onc::network_config::kType,
+      onc::network_config::kConnectionState,
+  };
+
+  scoped_ptr<api::NetworkProperties> filtered_result(
+      new api::NetworkProperties);
+  for (size_t i = 0; i < arraysize(desired_fields); ++i) {
+    base::Value* value;
+    if (onc_properties->Get(desired_fields[i], &value))
+      filtered_result->additional_properties.Set(desired_fields[i],
+                                                 value->DeepCopy());
+  }
+
+  return filtered_result.Pass();
+}
+
+}  // namespace
+
+////////////////////////////////////////////////////////////////////////////////
+// NetworkingPrivateGetPropertiesFunction
+
+NetworkingPrivateGetPropertiesFunction::
+  ~NetworkingPrivateGetPropertiesFunction() {
+}
+
+bool NetworkingPrivateGetPropertiesFunction::RunImpl() {
+  scoped_ptr<api::GetProperties::Params> params =
+      api::GetProperties::Params::Create(*args_);
+  EXTENSION_FUNCTION_VALIDATE(params);
+
+  // TODO(gspencer): Currently we're using the service path as the
+  // |network_guid|. Eventually this should be using the real GUID.
+  DBusThreadManager::Get()->GetShillServiceClient()->GetProperties(
+      dbus::ObjectPath(params->network_guid),
+      base::Bind(&NetworkingPrivateGetPropertiesFunction::ResultCallback,
+                 this));
+  return true;
+}
+
+void NetworkingPrivateGetPropertiesFunction::ResultCallback(
+    DBusMethodCallStatus call_status,
+    const base::DictionaryValue& result) {
+  scoped_ptr<api::NetworkProperties> filtered_result(
+      CreateFilteredResult(result));
+  results_ = api::GetProperties::Results::Create(*filtered_result);
+  SendResponse(true);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// NetworkingPrivateGetVisibleNetworksFunction::ResultList

[not at google - send to devlin, 2013/02/02 00:11:32]

if you put the method bodies all within the class declaration, you could delete
this banner...

[Greg Spencer (Chromium), 2013/02/02 01:06:15]

Done.

+class NetworkingPrivateGetVisibleNetworksFunction::ResultList
+    : public base::RefCounted<ResultList> {
+ public:
+  explicit ResultList(
+      const base::Callback<void(scoped_ptr<base::ListValue> result)>& callback);
+
+  scoped_ptr<base::ListValue> GetResults() {
+    return api::GetVisibleNetworks::Results::Create(list_);
+  }
+  void Append(api::NetworkProperties* value);
+
+ private:
+  friend class base::RefCounted<ResultList>;
+  ~ResultList();
+
+  std::vector<linked_ptr<api::NetworkProperties> > list_;
+  base::Callback<void(scoped_ptr<base::ListValue> result)> callback_;
+
+  DISALLOW_COPY_AND_ASSIGN(ResultList);
+};
+
+NetworkingPrivateGetVisibleNetworksFunction::ResultList::ResultList(
+    const base::Callback<void(scoped_ptr<base::ListValue> result)>& callback)
+    : callback_(callback) {
+}
+
+NetworkingPrivateGetVisibleNetworksFunction::ResultList::~ResultList() {
+  callback_.Run(GetResults());
+}
+
+void NetworkingPrivateGetVisibleNetworksFunction::ResultList::Append(
+    api::NetworkProperties* value) {
+  list_.push_back(linked_ptr<api::NetworkProperties>(value));
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// NetworkingPrivateGetVisibleNetworksFunction
+
+NetworkingPrivateGetVisibleNetworksFunction::
+~NetworkingPrivateGetVisibleNetworksFunction() {
+}
+
+bool NetworkingPrivateGetVisibleNetworksFunction::RunImpl() {
+  scoped_ptr<api::GetVisibleNetworks::Params> params =
+      api::GetVisibleNetworks::Params::Create(*args_);
+  EXTENSION_FUNCTION_VALIDATE(params);
+
+  DBusThreadManager::Get()->GetShillManagerClient()->GetProperties(base::Bind(
+      &NetworkingPrivateGetVisibleNetworksFunction::ManagerPropertiesCallback,
+      this,
+      api::GetVisibleNetworks::Params::ToString(params->type)));
+  return true;
+}
+
+// For each of the available services, fire off a request for its properties.
+void NetworkingPrivateGetVisibleNetworksFunction::ManagerPropertiesCallback(
+    const std::string& network_type,
+    DBusMethodCallStatus call_status,
+    const base::DictionaryValue& result) {
+  const base::ListValue* available_services;
+  if (!result.GetList(flimflam::kServicesProperty, &available_services)) {
+    LOG(ERROR)
+        << "ShillManagerClient::GetProperties returned malformed service list.";
+    error_ = kInvalidResponseError;
+    SendResponse(false);
+    return;
+  }
+  scoped_refptr<ResultList> result_list(
+      new ResultList(
+          base::Bind(
+              &NetworkingPrivateGetVisibleNetworksFunction::SendResultCallback,
+              this)));
+  // If there just are no services, return an empty list.
+  if (available_services->GetSize() == 0) {
+    results_ = result_list->GetResults();
+    SendResponse(true);
+    return;
+  }
+  for (base::ListValue::const_iterator iter = available_services->begin();
+       iter != available_services->end(); ++iter) {
+    std::string service_path;
+    if (!(*iter)->GetAsString(&service_path)) {
+      LOG(ERROR)
+          << "ShillManagerClient::GetProperties returned malformed service.";
+      continue;
+    }
+
+    DBusThreadManager::Get()->GetShillServiceClient()->GetProperties(
+        dbus::ObjectPath(service_path),
+        base::Bind(
+            &NetworkingPrivateGetVisibleNetworksFunction::
+                ServicePropertiesCallback,
+            this,
+            service_path,
+            network_type,
+            result_list));
+  }
+}
+
+// If this network is of the appropriate type, add it to the results and
+// decrement the count.  If the count hits zero, then send the result.
+void NetworkingPrivateGetVisibleNetworksFunction::ServicePropertiesCallback(
+    const std::string& service_path,
+    const std::string& network_type,
+    scoped_refptr<ResultList> result_list,
+    DBusMethodCallStatus call_status,
+    const base::DictionaryValue& result) {
+  if (call_status == DBUS_METHOD_CALL_SUCCESS) {
+    scoped_ptr<api::NetworkProperties> filtered_result(
+        CreateFilteredResult(result));
+
+    std::string onc_type;
+    if (filtered_result->additional_properties.GetString(
+            onc::network_config::kType, &onc_type) &&
+        (onc_type == network_type ||
+         network_type == onc::network_type::kAllTypes)) {
+          // TODO(gspencer): For now the "GUID" we send back is going to look

[not at google - send to devlin, 2013/02/02 00:11:32]

This is indented 6 spaces. It should only be indented 2.

[Greg Spencer (Chromium), 2013/02/02 01:06:15]

Whoops.  Fixed.

+          // remarkably like the service path. Once this code starts using the
+          // NetworkStateHandler instead of Shill directly, we should remove
+          // this line so that we're sending back the actual GUID. The
+          // JavaScript shouldn't care: this ID is opaque to it, and it
+          // shouldn't store it anywhere.
+          filtered_result->additional_properties.SetString(
+              onc::network_config::kGUID, service_path);
+
+          result_list->Append(filtered_result.release());
+    }
+  }
+}
+
+void NetworkingPrivateGetVisibleNetworksFunction::SendResultCallback(
+    scoped_ptr<base::ListValue> result_list) {
+  results_.reset(result_list.release());
+  SendResponse(true);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// NetworkingPrivateStartConnectFunction
+
+NetworkingPrivateStartConnectFunction::
+  ~NetworkingPrivateStartConnectFunction() {
+}
+
+void  NetworkingPrivateStartConnectFunction::ConnectionStartSuccess() {
+  SendResponse(true);
+}
+
+void NetworkingPrivateStartConnectFunction::ConnectionStartFailed(
+    const std::string& errorName,

[not at google - send to devlin, 2013/02/02 00:11:32]

errorName -> error_name
errorMessage -> error_message

[Greg Spencer (Chromium), 2013/02/02 01:06:15]

I thought I did this already??  Maybe I just did it in the header...

+    const std::string& errorMessage) {
+  error_ = errorName;
+  SendResponse(false);
+}
+
+bool NetworkingPrivateStartConnectFunction::RunImpl() {
+  scoped_ptr<api::StartConnect::Params> params =
+      api::StartConnect::Params::Create(*args_);
+  EXTENSION_FUNCTION_VALIDATE(params);
+
+  // TODO(gspencer): For now, the "guid" we receive from the JavaScript is going
+  // to be the service path.  Fix this so it actually looks up the service path
+  // from the GUID once we're using the NetworkStateHandler.
+  std::string service_path = params->network_guid;
+
+  DBusThreadManager::Get()->GetShillServiceClient()->Connect(
+      dbus::ObjectPath(service_path),
+      base::Bind(
+          &NetworkingPrivateStartConnectFunction::ConnectionStartSuccess,
+          this),
+      base::Bind(&NetworkingPrivateStartConnectFunction::ConnectionStartFailed,
+                 this));
+  return true;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// NetworkingPrivateStartDisconnectFunction
+
+NetworkingPrivateStartDisconnectFunction::
+  ~NetworkingPrivateStartDisconnectFunction() {
+}
+
+void  NetworkingPrivateStartDisconnectFunction::DisconnectionStartSuccess() {
+  SendResponse(true);
+}
+
+void NetworkingPrivateStartDisconnectFunction::DisconnectionStartFailed(
+    const std::string& errorName,

[not at google - send to devlin, 2013/02/02 00:11:32]

ditto

?????????

[Greg Spencer (Chromium), 2013/02/02 01:06:15]

Done.

+    const std::string& errorMessage) {
+  error_ = errorName;
+  SendResponse(false);
+}
+
+bool NetworkingPrivateStartDisconnectFunction::RunImpl() {
+  scoped_ptr<api::StartDisconnect::Params> params =
+      api::StartDisconnect::Params::Create(*args_);
+  EXTENSION_FUNCTION_VALIDATE(params);
+
+  // TODO(gspencer): Currently the |network_guid| parameter is storing the
+  // service path.  Convert to using the actual guid when we start using
+  // the NetworkStateHandler.
+  DBusThreadManager::Get()->GetShillServiceClient()->Connect(
+      dbus::ObjectPath(params->network_guid),
+      base::Bind(
+          &NetworkingPrivateStartDisconnectFunction::DisconnectionStartSuccess,
+          this),
+      base::Bind(
+          &NetworkingPrivateStartDisconnectFunction::DisconnectionStartFailed,
+          this));
+  return true;
+}