summaryrefslogtreecommitdiff
path: root/dbus/object_manager.h
diff options
context:
space:
mode:
authorLuis Hector Chavez <lhchavez@google.com>2016-05-25 15:29:35 -0700
committerLuis Hector Chavez <lhchavez@google.com>2016-05-27 09:06:26 -0700
commit94ffa55491333f3dcc701befd0d2652922916d99 (patch)
tree40533589f9b338f32c7f30d7d0169118eef52959 /dbus/object_manager.h
parent520be045f15462281c61e53944100d7e303679be (diff)
downloadlibchrome-94ffa55491333f3dcc701befd0d2652922916d99.tar.gz
libchrome: Uprev the library to r395517 from Chromium
Pulled the latest and greatest version of libchrome from Chromium. The merge was done against r395517 which corresponds to git commit ebdcb576bb346af95b8ad219f6250daf63122f98 of May 23, 2016 Notable changes are: - scoped_ptr was removed in favor of std::unique_ptr - base/thread_task_runner_handle.h was moved to base/threading. BUG: 28985443 TEST: All tests in libchrome_test pass on dragonboard-eng build Change-Id: Ic9f9ed1cafe754c96cd2f007984514e091aaba39
Diffstat (limited to 'dbus/object_manager.h')
-rw-r--r--dbus/object_manager.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/dbus/object_manager.h b/dbus/object_manager.h
index 25834c54fe..a97495e1f9 100644
--- a/dbus/object_manager.h
+++ b/dbus/object_manager.h
@@ -166,8 +166,8 @@ public:
// called on each interface implementation with differing values of
// |interface_name| as appropriate. An implementation class will only
// receive multiple calls if it has registered for multiple interfaces.
- virtual void ObjectAdded(const ObjectPath& /* object_path */,
- const std::string& /* interface_name */) { }
+ virtual void ObjectAdded(const ObjectPath& /*object_path*/,
+ const std::string& /*interface_name*/) {}
// Called by ObjectManager to inform the implementation class than an
// object with the path |object_path| has been removed. Ths D-Bus interface
@@ -178,8 +178,8 @@ public:
// This method will be called before the Properties structure and the
// ObjectProxy object for the given interface are cleaned up, it is safe
// to retrieve them during removal to vary processing.
- virtual void ObjectRemoved(const ObjectPath& /* object_path */,
- const std::string& /* interface_name */) { }
+ virtual void ObjectRemoved(const ObjectPath& /*object_path*/,
+ const std::string& /*interface_name*/) {}
};
// Client code should use Bus::GetObjectManager() instead of this constructor.