Index: dbus/bus.h |
diff --git a/dbus/bus.h b/dbus/bus.h |
index 22c22189c6b264cbb0bddda96aebf8704cf461eb..e045386cfce107136f4b6f2b11f508b986495a43 100644 |
--- a/dbus/bus.h |
+++ b/dbus/bus.h |
@@ -17,6 +17,7 @@ |
#include "base/synchronization/waitable_event.h" |
#include "base/threading/platform_thread.h" |
#include "base/tracked_objects.h" |
+#include "dbus/object_path.h" |
class MessageLoop; |
@@ -112,7 +113,7 @@ class ObjectProxy; |
// } |
// |
// void OnExported(const std::string& interface_name, |
-// const std::string& object_path, |
+// const ObjectPath& object_path, |
// bool success) { |
// // success is true if the method was exported successfully. |
// } |
@@ -194,13 +195,13 @@ class Bus : public base::RefCountedThreadSafe<Bus> { |
// |
// Must be called in the origin thread. |
virtual ObjectProxy* GetObjectProxy(const std::string& service_name, |
- const std::string& object_path); |
+ const ObjectPath& 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, |
+ const ObjectPath& object_path, |
int options); |
// Gets the exported object for the given service name and the object |
@@ -219,7 +220,7 @@ class Bus : public base::RefCountedThreadSafe<Bus> { |
// |
// Must be called in the origin thread. |
virtual ExportedObject* GetExportedObject(const std::string& service_name, |
- const std::string& object_path); |
+ const ObjectPath& object_path); |
// Shuts down the bus and blocks until it's done. More specifically, this |
// function does the following: |
@@ -353,7 +354,7 @@ class Bus : public base::RefCountedThreadSafe<Bus> { |
// http://dbus.freedesktop.org/doc/api/html/group__DBusConnection.html |
// |
// BLOCKING CALL. |
- virtual bool TryRegisterObjectPath(const std::string& object_path, |
+ virtual bool TryRegisterObjectPath(const ObjectPath& object_path, |
const DBusObjectPathVTable* vtable, |
void* user_data, |
DBusError* error); |
@@ -361,7 +362,7 @@ class Bus : public base::RefCountedThreadSafe<Bus> { |
// Unregister the object path. |
// |
// BLOCKING CALL. |
- virtual void UnregisterObjectPath(const std::string& object_path); |
+ virtual void UnregisterObjectPath(const ObjectPath& object_path); |
// Posts the task to the message loop of the thread that created the bus. |
virtual void PostTaskToOriginThread( |
@@ -461,7 +462,7 @@ class Bus : public base::RefCountedThreadSafe<Bus> { |
// The following sets are used to check if rules/object_paths/filters |
// are properly cleaned up before destruction of the bus object. |
std::set<std::string> match_rules_added_; |
- std::set<std::string> registered_object_paths_; |
+ std::set<ObjectPath> registered_object_paths_; |
std::set<std::pair<DBusHandleMessageFunction, void*> > |
filter_functions_added_; |