Add NetworkStateHandler::RequestUpdateForNetwork

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 "chromeos/network/network_state_handler.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;
@@ skipping 113 matching lines @@
 void NetworkConfigurationHandler::SetProperties(
     const std::string& service_path,
     const base::DictionaryValue& properties,
     const base::Closure& callback,
     const network_handler::ErrorCallback& error_callback) const {
   DBusThreadManager::Get()->GetShillManagerClient()->ConfigureService(
       properties,
       base::Bind(&IgnoreObjectPathCallback, callback),
       base::Bind(&network_handler::ShillErrorCallbackFunction,
                  kLogModule, service_path, error_callback));
+  NetworkStateHandler::Get()->RequestUpdateForNetwork(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) {
   DBusThreadManager::Get()->GetShillServiceClient()->ClearProperties(
       dbus::ObjectPath(service_path),
       names,
@@ skipping 28 matching lines @@
         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));
   }

[pneubeck (no reviews), 2013/05/22 08:42:40]

here configuration is also modified by profile/guid and not by service; see the
calls from Managed*Handler.

We would have to call the StateHandler in the callback, where we obtain the
service path.


Alternatively, I can fix that when I __eventually__ merge it with the
Managed*Handler.
At least drop a TODO here.

[stevenjb, 2013/05/22 16:08:23]

I'm not entirely sure that I follow.

This creates a new configuration. If the new configuration becomes a visible
service, i.e. a member of Manager.Services, the list will be updated and since
it is a new service the properties will be requested, i.e. we do not need to
explicitly request an update.

[pneubeck (no reviews), 2013/05/22 18:02:09]

The name of the method is not identical to its usage:
It is currently also called by the Managed*Handler to overwrite an existing
configuration in a profile.

[stevenjb, 2013/05/22 18:45:35]

Ah. Right, we talked about the need to fix this, possibly after merging the two
classes? It looks like it is easy enough to trigger the call from the callback.
Done.

 }
 
 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