| Index: dbus/object_proxy.h
|
| ===================================================================
|
| --- dbus/object_proxy.h (revision 121922)
|
| +++ dbus/object_proxy.h (working copy)
|
| @@ -16,7 +16,6 @@
|
| #include "base/memory/ref_counted.h"
|
| #include "base/string_piece.h"
|
| #include "base/time.h"
|
| -#include "dbus/object_path.h"
|
|
|
| namespace dbus {
|
|
|
| @@ -36,7 +35,7 @@
|
| // Bus::GetObjectProxyWithOptions() instead of this constructor.
|
| ObjectProxy(Bus* bus,
|
| const std::string& service_name,
|
| - const ObjectPath& object_path,
|
| + const std::string& object_path,
|
| int options);
|
|
|
| // Options to be OR-ed together when calling Bus::GetObjectProxyWithOptions().
|
| @@ -197,7 +196,7 @@
|
|
|
| scoped_refptr<Bus> bus_;
|
| std::string service_name_;
|
| - ObjectPath object_path_;
|
| + std::string object_path_;
|
|
|
| // True if the message filter was added.
|
| bool filter_added_;
|
|
|