summaryrefslogtreecommitdiffstats
path: root/dbus/exported_object.cc
diff options
context:
space:
mode:
authorsatorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-04 13:47:21 +0000
committersatorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-04 13:47:21 +0000
commit1d887b27477d3b8af67ff392d704b430fa9a4c08 (patch)
tree3c9ff0bb7b99ff849a68b5a331f8dd3671aefa13 /dbus/exported_object.cc
parent2e99f7c101980a8958b28d990b6eb1ee385be35c (diff)
downloadchromium_src-1d887b27477d3b8af67ff392d704b430fa9a4c08.zip
chromium_src-1d887b27477d3b8af67ff392d704b430fa9a4c08.tar.gz
chromium_src-1d887b27477d3b8af67ff392d704b430fa9a4c08.tar.bz2
Eliminate hacks needed to work around a limitation of base::Bind()
base::Bind() used to be unable to handle opaque type pointers, but the limitation was fixed in crrev.com/103627. BUG=crosbug.com/21166 TEST=build and run dbus_unittests Review URL: http://codereview.chromium.org/8124002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103881 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'dbus/exported_object.cc')
-rw-r--r--dbus/exported_object.cc8
1 files changed, 2 insertions, 6 deletions
diff --git a/dbus/exported_object.cc b/dbus/exported_object.cc
index c4ebd3b..d207024 100644
--- a/dbus/exported_object.cc
+++ b/dbus/exported_object.cc
@@ -105,13 +105,11 @@ void ExportedObject::SendSignal(Signal* signal) {
dbus_message_ref(signal_message);
const base::TimeTicks start_time = base::TimeTicks::Now();
- // Bind() won't compile if we pass signal_message. See the comment at
- // ObjectProxy::CallMethod() for details.
bus_->PostTaskToDBusThread(FROM_HERE,
base::Bind(&ExportedObject::SendSignalInternal,
this,
start_time,
- static_cast<void*>(signal_message)));
+ signal_message));
}
void ExportedObject::Unregister() {
@@ -153,9 +151,7 @@ void ExportedObject::OnExported(OnExportedCallback on_exported_callback,
}
void ExportedObject::SendSignalInternal(base::TimeTicks start_time,
- void* in_signal_message) {
- DBusMessage* signal_message =
- static_cast<DBusMessage*>(in_signal_message);
+ DBusMessage* signal_message) {
uint32 serial = 0;
bus_->Send(signal_message, &serial);
dbus_message_unref(signal_message);