diff options
| author | dpapad@chromium.org <dpapad@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-14 20:22:53 +0000 |
|---|---|---|
| committer | dpapad@chromium.org <dpapad@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-14 20:22:53 +0000 |
| commit | 02743b707e2743cd0f0916e3b405191a48fa3947 (patch) | |
| tree | 2b0c0be422f99a2e0dce81c6de92f9a8bc80b969 /dbus/object_proxy.h | |
| parent | 7f58f3f417a0598ad796ca7de7b14a38252d91bd (diff) | |
| download | chromium_src-02743b707e2743cd0f0916e3b405191a48fa3947.zip chromium_src-02743b707e2743cd0f0916e3b405191a48fa3947.tar.gz chromium_src-02743b707e2743cd0f0916e3b405191a48fa3947.tar.bz2 | |
Revert 121920 - dbus: add ObjectPath type
Rather than use std::string for object paths, add a dbus::ObjectPath type
that wraps one while allowing more type-safety. This solves all sorts of
issues with confusing object paths for strings, and allows us to do
Properties code using templates disambiguating them from strings.
BUG=chromium:109194
TEST=built and run tests
Change-Id: Icaf6f19daea4af23a9d2ec0ed76d2cbd379d680e
Review URL: http://codereview.chromium.org/9378039
TBR=keybuk@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9363045
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121923 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'dbus/object_proxy.h')
| -rw-r--r-- | dbus/object_proxy.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/dbus/object_proxy.h b/dbus/object_proxy.h index 3a9fab1..3da4e9b 100644 --- a/dbus/object_proxy.h +++ b/dbus/object_proxy.h @@ -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 @@ class ObjectProxy : public base::RefCountedThreadSafe<ObjectProxy> { // 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 @@ class ObjectProxy : public base::RefCountedThreadSafe<ObjectProxy> { 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_; |