Index: dbus/bus.h |
diff --git a/dbus/bus.h b/dbus/bus.h |
index 4af07ce1089fc2585a3c0eb6ff5dd040458e8600..6b69a0fd8061f80b9f953eddc2ee76620ba4fac8 100644 |
--- a/dbus/bus.h |
+++ b/dbus/bus.h |
@@ -196,6 +196,13 @@ class Bus : public base::RefCountedThreadSafe<Bus> { |
virtual ObjectProxy* GetObjectProxy(const std::string& service_name, |
const std::string& object_path); |
+ // Same as above, but also takes a bitfield of ObjectProxy::Options. |
+ // See object_proxy.h for available options. |
+ virtual ObjectProxy* GetObjectProxyWithOptions( |
+ const std::string& service_name, |
+ const std::string& object_path, |
+ int options); |
+ |
// Gets the exported object for the given service name and the object |
// path. The caller must not delete the returned object. |
// |
@@ -468,6 +475,8 @@ class Bus : public base::RefCountedThreadSafe<Bus> { |
// ExportedObjectTable is used to hold the exported objects created by |
// the bus object. Key is a concatenated string of service name + |
// object path, like "org.chromium.TestService/org/chromium/TestObject". |
+ // If any ObjectProxy::Options were passed in, they are concatenated as an |
+ // int to the end of the key. |
satorux1
2012/02/10 18:09:01
This doesn't seem to be the right place. Move this
adamk
2012/02/10 19:28:21
Woops, this was meant to go above. I've updated t
|
typedef std::map<std::string, |
scoped_refptr<dbus::ExportedObject> > ExportedObjectTable; |
ExportedObjectTable exported_object_table_; |