| Index: dbus/object_proxy.h
|
| diff --git a/dbus/object_proxy.h b/dbus/object_proxy.h
|
| index 2d4ea68542c00a287146c09628770db7ac71c1ca..1400328fda068f7ca81a4d2ec8df56199fcba93c 100644
|
| --- a/dbus/object_proxy.h
|
| +++ b/dbus/object_proxy.h
|
| @@ -25,13 +25,14 @@ class Bus;
|
| class ErrorResponse;
|
| class MethodCall;
|
| class Response;
|
| +class ScopedDBusError;
|
| class Signal;
|
|
|
| // ObjectProxy is used to communicate with remote objects, mainly for
|
| // calling methods of these objects.
|
| //
|
| // ObjectProxy is a ref counted object, to ensure that |this| of the
|
| -// object is is alive when callbacks referencing |this| are called; the
|
| +// object is alive when callbacks referencing |this| are called; the
|
| // bus always holds at least one of those references so object proxies
|
| // always last as long as the bus that created them.
|
| class CHROME_DBUS_EXPORT ObjectProxy
|
| @@ -91,6 +92,16 @@ class CHROME_DBUS_EXPORT ObjectProxy
|
| OnConnectedCallback;
|
|
|
| // Calls the method of the remote object and blocks until the response
|
| + // is returned. Returns NULL on error with the error details specified
|
| + // in the |error| object.
|
| + //
|
| + // BLOCKING CALL.
|
| + virtual scoped_ptr<Response> CallMethodAndBlockWithErrorDetails(
|
| + MethodCall* method_call,
|
| + int timeout_ms,
|
| + ScopedDBusError* error);
|
| +
|
| + // Calls the method of the remote object and blocks until the response
|
| // is returned. Returns NULL on error.
|
| //
|
| // BLOCKING CALL.
|
| @@ -305,7 +316,7 @@ class CHROME_DBUS_EXPORT ObjectProxy
|
|
|
| const bool ignore_service_unknown_errors_;
|
|
|
| - // Known name owner of the well-known bus name represnted by |service_name_|.
|
| + // Known name owner of the well-known bus name represented by |service_name_|.
|
| std::string service_name_owner_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ObjectProxy);
|
|
|