[shill] Wire up derived properties in the Device class
BUG=chromium-os:16343
TEST=unit tests
Change-Id: Ib35efbc00133b6ffc9352e52c0413be4bd984e12
Reviewed-on: http://gerrit.chromium.org/gerrit/3559
Tested-by: Chris Masone <cmasone@chromium.org>
Reviewed-by: mukesh agrawal <quiche@chromium.org>
diff --git a/device_dbus_adaptor.h b/device_dbus_adaptor.h
index c6505fe..ac6bb28 100644
--- a/device_dbus_adaptor.h
+++ b/device_dbus_adaptor.h
@@ -33,12 +33,14 @@
virtual ~DeviceDBusAdaptor();
// Implementation of DeviceAdaptorInterface.
- virtual const std::string &GetRpcIdentifier() { return path(); }
- void UpdateEnabled();
- void EmitBoolChanged(const std::string& name, bool value);
- void EmitUintChanged(const std::string& name, uint32 value);
- void EmitIntChanged(const std::string& name, int value);
- void EmitStringChanged(const std::string& name, const std::string& value);
+ virtual const std::string &GetRpcIdentifier();
+ virtual const std::string &GetRpcConnectionIdentifier();
+ virtual void UpdateEnabled();
+ virtual void EmitBoolChanged(const std::string& name, bool value);
+ virtual void EmitUintChanged(const std::string& name, uint32 value);
+ virtual void EmitIntChanged(const std::string& name, int value);
+ virtual void EmitStringChanged(const std::string& name,
+ const std::string& value);
// Implementation of Device_adaptor.
std::map<std::string, ::DBus::Variant> GetProperties(::DBus::Error &error);
@@ -60,6 +62,7 @@
private:
Device *device_;
+ const std::string connection_name_;
DISALLOW_COPY_AND_ASSIGN(DeviceDBusAdaptor);
};