Index: chromeos/dbus/shill_device_client.h |
diff --git a/chromeos/dbus/shill_device_client.h b/chromeos/dbus/shill_device_client.h |
index ea55b6da238321a287a5d577d8d2ba953e168f15..a7d7c148bf38110441df276b2237aafc33006fc9 100644 |
--- a/chromeos/dbus/shill_device_client.h |
+++ b/chromeos/dbus/shill_device_client.h |
@@ -37,6 +37,7 @@ class CHROMEOS_EXPORT ShillDeviceClient { |
typedef ShillClientHelper::PropertyChangedHandler PropertyChangedHandler; |
typedef ShillClientHelper::DictionaryValueCallback DictionaryValueCallback; |
typedef ShillClientHelper::ErrorCallback ErrorCallback; |
+ typedef ShillClientHelper::PropertyChangedObserver PropertyChangedObserver; |
virtual ~ShillDeviceClient(); |
@@ -45,14 +46,13 @@ class CHROMEOS_EXPORT ShillDeviceClient { |
static ShillDeviceClient* Create(DBusClientImplementationType type, |
dbus::Bus* bus); |
- // Sets PropertyChanged signal handler. |
- virtual void SetPropertyChangedHandler( |
+ virtual void AddPropertyChangedObserver( |
hashimoto
2012/09/21 11:52:01
Please add method comments.
Greg Spencer (Chromium)
2012/09/21 22:03:47
Done.
|
const dbus::ObjectPath& device_path, |
- const PropertyChangedHandler& handler) = 0; |
+ PropertyChangedObserver* observer) = 0; |
- // Resets PropertyChanged signal handler. |
- virtual void ResetPropertyChangedHandler( |
- const dbus::ObjectPath& device_path) = 0; |
+ virtual void RemovePropertyChangedObserver( |
+ const dbus::ObjectPath& device_path, |
+ PropertyChangedObserver* observer) = 0; |
// Calls GetProperties method. |
// |callback| is called after the method call finishes. |
@@ -78,7 +78,8 @@ class CHROMEOS_EXPORT ShillDeviceClient { |
virtual void SetProperty(const dbus::ObjectPath& device_path, |
const std::string& name, |
const base::Value& value, |
- const VoidDBusMethodCallback& callback) = 0; |
+ const base::Closure& callback, |
+ const ErrorCallback& error_callback) = 0; |
// Calls ClearProperty method. |
// |callback| is called after the method call finishes. |