Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(402)

Unified Diff: components/usb_service/usb_device_handle_impl.h

Issue 507503002: Remove BrowserThread dependency from usb_service. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Do the same to chrome/browser/BUILD.gn. Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/usb_service/usb_device_handle_impl.h
diff --git a/components/usb_service/usb_device_handle_impl.h b/components/usb_service/usb_device_handle_impl.h
index 7d113377ee1ade3a358ea334dfe397537be8200b..66d696018f7e76176f556ec1f35dbac6d629ea48 100644
--- a/components/usb_service/usb_device_handle_impl.h
+++ b/components/usb_service/usb_device_handle_impl.h
@@ -15,13 +15,10 @@
#include "components/usb_service/usb_device_handle.h"
#include "components/usb_service/usb_interface.h"
#include "net/base/io_buffer.h"
-
-struct libusb_device_handle;
-struct libusb_iso_packet_descriptor;
-struct libusb_transfer;
+#include "third_party/libusb/src/libusb/libusb.h"
namespace base {
-class MessageLoopProxy;
+class SingleThreadTaskRunner;
}
namespace usb_service {
@@ -97,8 +94,6 @@ class UsbDeviceHandleImpl : public UsbDeviceHandle {
virtual ~UsbDeviceHandleImpl();
private:
- friend void HandleTransferCompletion(PlatformUsbTransferHandle handle);
-
class InterfaceClaimer;
struct Transfer;
@@ -111,6 +106,16 @@ class UsbDeviceHandleImpl : public UsbDeviceHandle {
scoped_refptr<InterfaceClaimer> GetClaimedInterfaceForEndpoint(
unsigned char endpoint);
+ // If the device's task runner is on the current thread then the transfer will
+ // be submitted directly, otherwise a task to do so it posted. The callback
+ // will be called on the current message loop of the thread where this
+ // function was called.
+ void PostOrSubmitTransfer(PlatformUsbTransferHandle handle,
+ UsbTransferType transfer_type,
+ net::IOBuffer* buffer,
+ size_t length,
+ const UsbTransferCallback& callback);
+
// Submits a transfer and starts tracking it. Retains the buffer and copies
// the completion callback until the transfer finishes, whereupon it invokes
// the callback then releases the buffer.
@@ -118,12 +123,15 @@ class UsbDeviceHandleImpl : public UsbDeviceHandle {
UsbTransferType transfer_type,
net::IOBuffer* buffer,
const size_t length,
- scoped_refptr<base::MessageLoopProxy> message_loop_proxy,
+ scoped_refptr<base::SingleThreadTaskRunner> task_runner,
const UsbTransferCallback& callback);
+ static void LIBUSB_CALL
+ PlatformTransferCallback(PlatformUsbTransferHandle handle);
+
// Invokes the callbacks associated with a given transfer, and removes it from
// the in-flight transfer set.
- void TransferComplete(PlatformUsbTransferHandle transfer);
+ void CompleteTransfer(PlatformUsbTransferHandle transfer);
bool GetSupportedLanguages();
bool GetStringDescriptor(uint8 string_id, base::string16* string);
@@ -154,6 +162,8 @@ class UsbDeviceHandleImpl : public UsbDeviceHandle {
// before this handle.
scoped_refptr<UsbContext> context_;
+ scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
+
base::ThreadChecker thread_checker_;
DISALLOW_COPY_AND_ASSIGN(UsbDeviceHandleImpl);

Powered by Google App Engine
This is Rietveld 408576698