Add chromeos::NetworkStateManager

chromeos/dbus/shill_device_client.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/dbus/shill_device_client.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "base/stl_util.h"
 #include "base/values.h"
@@ skipping 214 matching lines @@
   ShillDeviceClientStubImpl() : weak_ptr_factory_(this) {
     SetDefaultProperties();
   }
 
   virtual ~ShillDeviceClientStubImpl() {}
 
   // ShillDeviceClient overrides.
 
   virtual void AddPropertyChangedObserver(
       const dbus::ObjectPath& device_path,
-      ShillPropertyChangedObserver* observer) OVERRIDE {}
+      ShillPropertyChangedObserver* observer) OVERRIDE {
+    observer_list_.AddObserver(observer);

[hashimoto, 2012/11/05 04:03:03]

You might need to change the type of observer_list_ to
std::map<dbus::ObjectPath, ObserverList<ShillPropertyChangedObserver> >.
With the current code, an observer gets notified about all devices regardless of
which device it is interested in.
This is my fault, I should have caught this in the previous code review, sorry.

[stevenjb, 2012/11/05 22:42:35]

Good catch, fixed.

+  }
 
   virtual void RemovePropertyChangedObserver(
       const dbus::ObjectPath& device_path,
-      ShillPropertyChangedObserver* observer) OVERRIDE {}
+      ShillPropertyChangedObserver* observer) OVERRIDE {
+    observer_list_.RemoveObserver(observer);
+  }
 
   virtual void GetProperties(const dbus::ObjectPath& device_path,
                              const DictionaryValueCallback& callback) OVERRIDE {
     MessageLoop::current()->PostTask(
         FROM_HERE,
         base::Bind(&ShillDeviceClientStubImpl::PassStubDeviceProperties,
                    weak_ptr_factory_.GetWeakPtr(),
                    device_path, callback));
   }
 
@@ skipping 20 matching lines @@
       std::string error_name("org.chromium.flimflam.Error.Failure");
       std::string error_message("Failed");
       MessageLoop::current()->PostTask(FROM_HERE,
                                        base::Bind(error_callback,
                                                   error_name,
                                                   error_message));
       return;
     }
     device_properties->Set(name, value.DeepCopy());
     MessageLoop::current()->PostTask(FROM_HERE, callback);
+    MessageLoop::current()->PostTask(
+        FROM_HERE,
+        base::Bind(&ShillDeviceClientStubImpl::NotifyObserversPropertyChanged,
+                   weak_ptr_factory_.GetWeakPtr(), device_path, name));
   }
 
   virtual void ClearProperty(const dbus::ObjectPath& device_path,
                              const std::string& name,
                              const VoidDBusMethodCallback& callback) OVERRIDE {
     base::DictionaryValue* device_properties = NULL;
     if (!stub_devices_.GetDictionary(device_path.value(), &device_properties)) {
       PostVoidCallback(callback, DBUS_METHOD_CALL_FAILURE);
       return;
     }
     device_properties->Remove(name, NULL);
     PostVoidCallback(callback, DBUS_METHOD_CALL_SUCCESS);

[hashimoto, 2012/11/05 04:03:03]

Is there no need to notify observers about the cleared property? What does the
real Shill service do on ClearProperty?

[stevenjb, 2012/11/05 22:42:35]

The dbus impl calls ShillClientHelper::CallVoidMethod() which does trigger the
callback on completion, so we should be consistent and do that here too.

   }
 
   virtual void AddIPConfig(
       const dbus::ObjectPath& device_path,
       const std::string& method,
       const ObjectPathDBusMethodCallback& callback) OVERRIDE {
     MessageLoop::current()->PostTask(FROM_HERE,
                                      base::Bind(callback,
                                                 DBUS_METHOD_CALL_SUCCESS,
                                                 dbus::ObjectPath()));
@@ skipping 104 matching lines @@
     callback.Run(DBUS_METHOD_CALL_SUCCESS, *device_properties);
   }
 
   // Posts a task to run a void callback with status code |status|.
   void PostVoidCallback(const VoidDBusMethodCallback& callback,
                         DBusMethodCallStatus status) {
     MessageLoop::current()->PostTask(FROM_HERE,
                                      base::Bind(callback, status));
   }
 
+  void NotifyObserversPropertyChanged(const dbus::ObjectPath& device_path,
+                                      const std::string& property) {
+    base::DictionaryValue* dict = NULL;
+    std::string path = device_path.value();
+    if (!stub_devices_.GetDictionaryWithoutPathExpansion(path, &dict)) {
+      LOG(ERROR) << "Notify for unknown service: " << path;
+      return;
+    }
+    base::Value* value = NULL;
+    if (!dict->GetWithoutPathExpansion(property, &value)) {
+      LOG(ERROR) << "Notify for unknown property: "
+                 << path << " : " << property;
+      return;
+    }
+    FOR_EACH_OBSERVER(ShillPropertyChangedObserver,
+                      observer_list_,
+                      OnPropertyChanged(property, *value));
+  }
+
   base::DictionaryValue* GetDeviceProperties(const std::string& device_path) {
     base::DictionaryValue* properties = NULL;
     if (!stub_devices_.GetDictionaryWithoutPathExpansion(
             device_path, &properties)) {
       properties = new base::DictionaryValue;
       stub_devices_.Set(device_path, properties);
     }
     return properties;
   }
 
   // Dictionary of <device_name, Dictionary>.
   base::DictionaryValue stub_devices_;
+  ObserverList<ShillPropertyChangedObserver> observer_list_;
 
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate its weak pointers before any other members are destroyed.
   base::WeakPtrFactory<ShillDeviceClientStubImpl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ShillDeviceClientStubImpl);
 };
 
 }  // namespace
 
 ShillDeviceClient::ShillDeviceClient() {}
 
 ShillDeviceClient::~ShillDeviceClient() {}
 
 // static
 ShillDeviceClient* ShillDeviceClient::Create(
     DBusClientImplementationType type,
     dbus::Bus* bus) {
   if (type == REAL_DBUS_CLIENT_IMPLEMENTATION)
     return new ShillDeviceClientImpl(bus);
   DCHECK_EQ(STUB_DBUS_CLIENT_IMPLEMENTATION, type);
   return new ShillDeviceClientStubImpl();
 }
 
 }  // namespace chromeos