Index: chrome/browser/chromeos/dbus/proxy_resolution_service_provider.h |
=================================================================== |
--- chrome/browser/chromeos/dbus/proxy_resolution_service_provider.h (revision 111486) |
+++ chrome/browser/chromeos/dbus/proxy_resolution_service_provider.h (working copy) |
@@ -15,9 +15,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; |
} |
@@ -104,15 +104,13 @@ |
// 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. |
- void ResolveProxyHandler(dbus::MethodCall* method_call, |
- dbus::ExportedObject::ResponseSender response_sender); |
+ dbus::Response* ResolveProxyHandler(dbus::MethodCall* method_call); |
// Calls ResolveProxyHandler() if weak_ptr is not NULL. Used to ensure a |
// safe shutdown. |
- static void CallResolveProxyHandler( |
+ static dbus::Response* CallResolveProxyHandler( |
base::WeakPtr<ProxyResolutionServiceProvider> weak_ptr, |
- dbus::MethodCall* method_call, |
- dbus::ExportedObject::ResponseSender response_sender); |
+ dbus::MethodCall* method_call); |
// Returns true if the current thread is on the origin thread. |
bool OnOriginThread(); |