diff options
| author | keybuk@chromium.org <keybuk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-14 20:08:06 +0000 |
|---|---|---|
| committer | keybuk@chromium.org <keybuk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-14 20:08:06 +0000 |
| commit | bc1b18ecfc890dde4aae0a5a5db27dde2796b25e (patch) | |
| tree | 8e37e62d98047d218bf8fdeff2f10361fbaab961 /dbus/exported_object.cc | |
| parent | ce1402accb9a01358fc1235f1319d934cd611248 (diff) | |
| download | chromium_src-bc1b18ecfc890dde4aae0a5a5db27dde2796b25e.zip chromium_src-bc1b18ecfc890dde4aae0a5a5db27dde2796b25e.tar.gz chromium_src-bc1b18ecfc890dde4aae0a5a5db27dde2796b25e.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121920 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'dbus/exported_object.cc')
| -rw-r--r-- | dbus/exported_object.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/dbus/exported_object.cc b/dbus/exported_object.cc index de25168..730c98b 100644 --- a/dbus/exported_object.cc +++ b/dbus/exported_object.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -13,6 +13,7 @@ #include "base/time.h" #include "dbus/bus.h" #include "dbus/message.h" +#include "dbus/object_path.h" #include "dbus/scoped_dbus_error.h" namespace dbus { @@ -35,7 +36,7 @@ std::string GetAbsoluteMethodName( ExportedObject::ExportedObject(Bus* bus, const std::string& service_name, - const std::string& object_path) + const ObjectPath& object_path) : bus_(bus), service_name_(service_name), object_path_(object_path), @@ -175,8 +176,8 @@ bool ExportedObject::Register() { this, error.get()); if (!success) { - LOG(ERROR) << "Failed to register the object: " << object_path_ << ": " - << (error.is_set() ? error.message() : ""); + LOG(ERROR) << "Failed to register the object: " << object_path_.value() + << ": " << (error.is_set() ? error.message() : ""); return false; } |