summaryrefslogtreecommitdiffstats
path: root/dbus/object_proxy.h
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/object_proxy.h
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/object_proxy.h')
-rw-r--r--dbus/object_proxy.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/dbus/object_proxy.h b/dbus/object_proxy.h
index ffd59c2..a950e94 100644
--- a/dbus/object_proxy.h
+++ b/dbus/object_proxy.h
@@ -129,7 +129,7 @@ class ObjectProxy : public base::RefCountedThreadSafe<ObjectProxy> {
// Starts the async method call. This is a helper function to implement
// CallMethod().
void StartAsyncMethodCall(int timeout_ms,
- void* request_message,
+ DBusMessage* request_message,
ResponseCallback response_callback,
base::TimeTicks start_time);
@@ -141,7 +141,7 @@ class ObjectProxy : public base::RefCountedThreadSafe<ObjectProxy> {
// Runs the response callback with the given response object.
void RunResponseCallback(ResponseCallback response_callback,
base::TimeTicks start_time,
- void* response_message);
+ DBusMessage* response_message);
// Redirects the function call to OnPendingCallIsComplete().
static void OnPendingCallIsCompleteThunk(DBusPendingCall* pending_call,