Index: chrome/browser/devtools/device/usb/android_usb_device.h |
diff --git a/chrome/browser/devtools/device/usb/android_usb_device.h b/chrome/browser/devtools/device/usb/android_usb_device.h |
index 3400a977dcaabdc5b5edca1d311582c63b5bd55a..f62ca8708f7ff41bd37cfa7a67523357bad41778 100644 |
--- a/chrome/browser/devtools/device/usb/android_usb_device.h |
+++ b/chrome/browser/devtools/device/usb/android_usb_device.h |
@@ -15,7 +15,7 @@ |
#include "device/usb/usb_device_handle.h" |
namespace base { |
-class MessageLoop; |
+class SingleThreadTaskRunner; |
} |
namespace crypto { |
@@ -68,11 +68,10 @@ typedef base::Callback<void(const AndroidUsbDevices&)> |
class AndroidUsbDevice : public base::RefCountedThreadSafe<AndroidUsbDevice> { |
public: |
+ static void CountDevices(const base::Callback<void(int)>& callback); |
static void Enumerate(crypto::RSAPrivateKey* rsa_key, |
const AndroidUsbDevicesCallback& callback); |
- static void CountDevices(const base::Callback<void(int)>& callback); |
- |
AndroidUsbDevice(crypto::RSAPrivateKey* rsa_key, |
scoped_refptr<device::UsbDeviceHandle> device, |
const std::string& serial, |
@@ -102,11 +101,20 @@ class AndroidUsbDevice : public base::RefCountedThreadSafe<AndroidUsbDevice> { |
void Queue(scoped_ptr<AdbMessage> message); |
void ProcessOutgoing(); |
- void OutgoingMessageSent(device::UsbTransferStatus status, |
- scoped_refptr<net::IOBuffer> buffer, |
- size_t result); |
+ static void OutgoingMessageSent( |
+ base::WeakPtr<AndroidUsbDevice> device, |
+ scoped_refptr<base::SingleThreadTaskRunner> task_runner, |
+ device::UsbTransferStatus status, |
+ scoped_refptr<net::IOBuffer> buffer, |
+ size_t result); |
void ReadHeader(); |
+ static void ReceivedHeader( |
+ base::WeakPtr<AndroidUsbDevice> device, |
+ scoped_refptr<base::SingleThreadTaskRunner> task_runner, |
+ device::UsbTransferStatus status, |
+ scoped_refptr<net::IOBuffer> buffer, |
+ size_t result); |
void ParseHeader(device::UsbTransferStatus status, |
scoped_refptr<net::IOBuffer> buffer, |
size_t result); |
@@ -114,6 +122,15 @@ class AndroidUsbDevice : public base::RefCountedThreadSafe<AndroidUsbDevice> { |
void ReadBody(scoped_ptr<AdbMessage> message, |
uint32 data_length, |
uint32 data_check); |
+ static void ReceivedBody( |
+ base::WeakPtr<AndroidUsbDevice> device, |
+ scoped_refptr<base::SingleThreadTaskRunner> task_runner, |
+ scoped_ptr<AdbMessage> message, |
+ uint32 data_length, |
+ uint32 data_check, |
+ device::UsbTransferStatus status, |
+ scoped_refptr<net::IOBuffer> buffer, |
+ size_t result); |
void ParseBody(scoped_ptr<AdbMessage> message, |
uint32 data_length, |
uint32 data_check, |
@@ -130,7 +147,7 @@ class AndroidUsbDevice : public base::RefCountedThreadSafe<AndroidUsbDevice> { |
void SocketDeleted(uint32 socket_id); |
- base::MessageLoop* message_loop_; |
+ scoped_refptr<base::SingleThreadTaskRunner> task_runner_; |
scoped_ptr<crypto::RSAPrivateKey> rsa_key_; |