Adding policy support to the new network configuration stack.

chromeos/network/network_configuration_handler.cc

 // Copyright (c) 2012 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 "chromeos/network/network_configuration_handler.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 #include "chromeos/dbus/dbus_method_call_status.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/shill_manager_client.h"
 #include "chromeos/dbus/shill_service_client.h"
 #include "dbus/object_path.h"
+#include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace chromeos {
 
 namespace {
 
 const char kLogModule[] = "NetworkConfigurationHandler";
 
 NetworkConfigurationHandler* g_configuration_handler_instance = NULL;
 
 // None of these error messages are user-facing: they should only appear in
@@ skipping 156 matching lines @@
       dbus::ObjectPath(service_path),
       callback,
       base::Bind(&network_handler::ShillErrorCallbackFunction,
                  kLogModule, service_path, error_callback));
 }
 
 void NetworkConfigurationHandler::CreateConfiguration(
     const base::DictionaryValue& properties,
     const network_handler::StringResultCallback& callback,
     const network_handler::ErrorCallback& error_callback) const {
-  DBusThreadManager::Get()->GetShillManagerClient()->GetService(
-      properties,
-      base::Bind(&RunCreateNetworkCallback, callback),
-      base::Bind(&network_handler::ShillErrorCallbackFunction,
-                 kLogModule, "", error_callback));
+  ShillManagerClient* manager =
+      DBusThreadManager::Get()->GetShillManagerClient();
+
+  std::string type;
+  properties.GetStringWithoutPathExpansion(flimflam::kTypeProperty, &type);
+  if (type == flimflam::kTypeWifi) {
+    std::string profile;
+    properties.GetStringWithoutPathExpansion(flimflam::kProfileProperty,
+                                             &profile);
+    manager->ConfigureServiceForProfile(
+        dbus::ObjectPath(profile),
+        properties,
+        base::Bind(&RunCreateNetworkCallback, callback),
+        base::Bind(&network_handler::ShillErrorCallbackFunction,
+                   kLogModule, "", error_callback));
+  } else {
+    manager->GetService(
+        properties,
+        base::Bind(&RunCreateNetworkCallback, callback),
+        base::Bind(&network_handler::ShillErrorCallbackFunction,
+                   kLogModule, "", error_callback));
+  }
 }
 
 void NetworkConfigurationHandler::RemoveConfiguration(
     const std::string& service_path,
     const base::Closure& callback,
     const network_handler::ErrorCallback& error_callback) const {
   DBusThreadManager::Get()->GetShillServiceClient()->Remove(
       dbus::ObjectPath(service_path),
       callback,
       base::Bind(&network_handler::ShillErrorCallbackFunction,
                  kLogModule, service_path, error_callback));
 }
 
 NetworkConfigurationHandler::NetworkConfigurationHandler() {
 }
 
 NetworkConfigurationHandler::~NetworkConfigurationHandler() {
 }
 
 }  // namespace chromeos