summaryrefslogtreecommitdiffstats
path: root/dbus/object_proxy.h
diff options
context:
space:
mode:
Diffstat (limited to 'dbus/object_proxy.h')
-rw-r--r--dbus/object_proxy.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/dbus/object_proxy.h b/dbus/object_proxy.h
index 70e412df..ae9bd9a3 100644
--- a/dbus/object_proxy.h
+++ b/dbus/object_proxy.h
@@ -60,12 +60,11 @@ class ObjectProxy : public base::RefCountedThreadSafe<ObjectProxy> {
OnConnectedCallback;
// Calls the method of the remote object and blocks until the response
- // is returned.
+ // is returned. Returns NULL on error.
//
// BLOCKING CALL.
- virtual bool CallMethodAndBlock(MethodCall* method_call,
- int timeout_ms,
- Response* response);
+ virtual Response* CallMethodAndBlock(MethodCall* method_call,
+ int timeout_ms);
// Requests to call the method of the remote object.
//
@@ -132,7 +131,7 @@ class ObjectProxy : public base::RefCountedThreadSafe<ObjectProxy> {
// Runs the response callback with the given response object.
void RunResponseCallback(ResponseCallback response_callback,
- Response* response);
+ void* response_message);
// Redirects the function call to OnPendingCallIsComplete().
static void OnPendingCallIsCompleteThunk(DBusPendingCall* pending_call,