Index: dbus/bus.cc |
=================================================================== |
--- dbus/bus.cc (revision 121922) |
+++ dbus/bus.cc (working copy) |
@@ -16,7 +16,6 @@ |
#include "base/threading/thread_restrictions.h" |
#include "base/time.h" |
#include "dbus/exported_object.h" |
-#include "dbus/object_path.h" |
#include "dbus/object_proxy.h" |
#include "dbus/scoped_dbus_error.h" |
@@ -208,19 +207,18 @@ |
} |
ObjectProxy* Bus::GetObjectProxy(const std::string& service_name, |
- const ObjectPath& object_path) { |
+ const std::string& object_path) { |
return GetObjectProxyWithOptions(service_name, object_path, |
ObjectProxy::DEFAULT_OPTIONS); |
} |
ObjectProxy* Bus::GetObjectProxyWithOptions(const std::string& service_name, |
- const dbus::ObjectPath& object_path, |
+ const std::string& object_path, |
int options) { |
AssertOnOriginThread(); |
// Check if we already have the requested object proxy. |
- const ObjectProxyTable::key_type key(service_name + object_path.value(), |
- options); |
+ const ObjectProxyTable::key_type key(service_name + object_path, options); |
ObjectProxyTable::iterator iter = object_proxy_table_.find(key); |
if (iter != object_proxy_table_.end()) { |
return iter->second; |
@@ -234,11 +232,11 @@ |
} |
ExportedObject* Bus::GetExportedObject(const std::string& service_name, |
- const ObjectPath& object_path) { |
+ const std::string& object_path) { |
AssertOnOriginThread(); |
// Check if we already have the requested exported object. |
- const std::string key = service_name + object_path.value(); |
+ const std::string key = service_name + object_path; |
ExportedObjectTable::iterator iter = exported_object_table_.find(key); |
if (iter != exported_object_table_.end()) { |
return iter->second; |
@@ -523,7 +521,7 @@ |
match_rules_added_.erase(match_rule); |
} |
-bool Bus::TryRegisterObjectPath(const ObjectPath& object_path, |
+bool Bus::TryRegisterObjectPath(const std::string& object_path, |
const DBusObjectPathVTable* vtable, |
void* user_data, |
DBusError* error) { |
@@ -532,13 +530,13 @@ |
if (registered_object_paths_.find(object_path) != |
registered_object_paths_.end()) { |
- LOG(ERROR) << "Object path already registered: " << object_path.value(); |
+ LOG(ERROR) << "Object path already registered: " << object_path; |
return false; |
} |
const bool success = dbus_connection_try_register_object_path( |
connection_, |
- object_path.value().c_str(), |
+ object_path.c_str(), |
vtable, |
user_data, |
error); |
@@ -547,20 +545,20 @@ |
return success; |
} |
-void Bus::UnregisterObjectPath(const ObjectPath& object_path) { |
+void Bus::UnregisterObjectPath(const std::string& object_path) { |
DCHECK(connection_); |
AssertOnDBusThread(); |
if (registered_object_paths_.find(object_path) == |
registered_object_paths_.end()) { |
LOG(ERROR) << "Requested to unregister an unknown object path: " |
- << object_path.value(); |
+ << object_path; |
return; |
} |
const bool success = dbus_connection_unregister_object_path( |
connection_, |
- object_path.value().c_str()); |
+ object_path.c_str()); |
CHECK(success) << "Unable to allocate memory"; |
registered_object_paths_.erase(object_path); |
} |