Use setProperties for IP Config.

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/format_macros.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/shill_manager_client.h"
 #include "chromeos/dbus/shill_profile_client.h"
 #include "chromeos/dbus/shill_service_client.h"
+#include "chromeos/network/network_device_handler.h"
 #include "chromeos/network/network_event_log.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
 #include "chromeos/network/shill_property_util.h"
 #include "dbus/object_path.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace chromeos {
 
 namespace {
@@ skipping 218 matching lines @@
   LogConfigProperties("SetProperty", service_path, properties);
 
   scoped_ptr<base::DictionaryValue> properties_copy(properties.DeepCopy());
   DBusThreadManager::Get()->GetShillServiceClient()->SetProperties(
       dbus::ObjectPath(service_path), properties,
       base::Bind(&NetworkConfigurationHandler::SetPropertiesSuccessCallback,
                  AsWeakPtr(), service_path, base::Passed(&properties_copy),
                  source, callback),
       base::Bind(&NetworkConfigurationHandler::SetPropertiesErrorCallback,
                  AsWeakPtr(), service_path, error_callback));
+
+  // If we set the StaticIPConfig property, request an IP config refresh
+  // after calling SetProperties.
+  if (properties.HasKey(shill::kStaticIPConfigProperty))
+    RequestRefreshIPConfigs(service_path);
 }
 
 void NetworkConfigurationHandler::ClearProperties(
     const std::string& service_path,
     const std::vector<std::string>& names,
     const base::Closure& callback,
     const network_handler::ErrorCallback& error_callback) {
   if (names.empty()) {
     if (!callback.is_null())
       callback.Run();
@@ skipping 96 matching lines @@
 NetworkConfigurationHandler::NetworkConfigurationHandler()
     : network_state_handler_(NULL) {
 }
 
 NetworkConfigurationHandler::~NetworkConfigurationHandler() {
   STLDeleteContainerPairSecondPointers(
       profile_entry_deleters_.begin(), profile_entry_deleters_.end());
 }
 
 void NetworkConfigurationHandler::Init(
-    NetworkStateHandler* network_state_handler) {
+    NetworkStateHandler* network_state_handler,
+    NetworkDeviceHandler* network_device_handler) {
   network_state_handler_ = network_state_handler;
+  network_device_handler_ = network_device_handler;
 }
 
 void NetworkConfigurationHandler::RunCreateNetworkCallback(
     const std::string& profile_path,
     NetworkConfigurationObserver::Source source,
     scoped_ptr<base::DictionaryValue> configure_properties,
     const network_handler::StringResultCallback& callback,
     const dbus::ObjectPath& service_path) {
   if (!callback.is_null())
     callback.Run(service_path.value());
@@ skipping 96 matching lines @@
     const std::string& dbus_error_name,
     const std::string& dbus_error_message) {
   network_handler::ShillErrorCallbackFunction(
       "Config.ClearProperties Failed",
       service_path, error_callback,
       dbus_error_name, dbus_error_message);
   // Some properties may have changed so request an update regardless.
   network_state_handler_->RequestUpdateForNetwork(service_path);
 }
 
+void NetworkConfigurationHandler::RequestRefreshIPConfigs(
+    const std::string& service_path) {
+  if (!network_device_handler_)
+    return;
+  const NetworkState* network_state =
+      network_state_handler_->GetNetworkState(service_path);
+  if (!network_state || network_state->device_path().empty())
+    return;
+  network_device_handler_->RequestRefreshIPConfigs(
+      network_state->device_path(), base::Bind(&base::DoNothing),
+      network_handler::ErrorCallback());
+}
+
 // static
 NetworkConfigurationHandler* NetworkConfigurationHandler::InitializeForTest(
-    NetworkStateHandler* network_state_handler) {
+    NetworkStateHandler* network_state_handler,
+    NetworkDeviceHandler* network_device_handler) {
   NetworkConfigurationHandler* handler = new NetworkConfigurationHandler();
-  handler->Init(network_state_handler);
+  handler->Init(network_state_handler, network_device_handler);
   return handler;
 }
 
 }  // namespace chromeos