Chromium Code Reviews| Index: chrome/browser/chromeos/dbus/proxy_resolution_service_provider.h |
| diff --git a/chrome/browser/chromeos/dbus/proxy_resolution_service_provider.h b/chrome/browser/chromeos/dbus/proxy_resolution_service_provider.h |
| index 8fc0635fc3c1311b8116e9449fbebdd3554c5428..5da29bad97c6703faf053117b3fecfa46c0ece11 100644 |
| --- a/chrome/browser/chromeos/dbus/proxy_resolution_service_provider.h |
| +++ b/chrome/browser/chromeos/dbus/proxy_resolution_service_provider.h |
| @@ -14,9 +14,9 @@ |
| #include "base/synchronization/lock.h" |
| #include "base/threading/platform_thread.h" |
| #include "chrome/browser/chromeos/dbus/cros_dbus_service.h" |
| +#include "dbus/exported_object.h" |
| namespace dbus { |
| -class ExportedObject; |
| class MethodCall; |
| class Response; |
| } |
| @@ -102,13 +102,15 @@ class ProxyResolutionServiceProvider |
| // Callback to be invoked when ChromeOS clients send network proxy |
| // resolution requests to the service running in chrome executable. |
| // Called on UI thread from dbus request. |
| - dbus::Response* ResolveProxyHandler(dbus::MethodCall* method_call); |
| + void ResolveProxyHandler(dbus::MethodCall* method_call, |
| + dbus::ExportedObject::SendResponseCallback send_response_cb); |
|
satorux1
2011/11/22 06:20:05
cb -> callback, as we generally eschew abbreviatio
Vince Laviano
2011/11/22 22:10:17
Done.
|
| // Calls ResolveProxyHandler() if weak_ptr is not NULL. Used to ensure a |
| // safe shutdown. |
| - static dbus::Response* CallResolveProxyHandler( |
| + static void CallResolveProxyHandler( |
| base::WeakPtr<ProxyResolutionServiceProvider> weak_ptr, |
| - dbus::MethodCall* method_call); |
| + dbus::MethodCall* method_call, |
| + dbus::ExportedObject::SendResponseCallback send_response_cb); |
|
satorux1
2011/11/22 06:20:05
ditto
Vince Laviano
2011/11/22 22:10:17
Done.
|
| // Returns true if the current thread is on the origin thread. |
| bool OnOriginThread(); |