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

Unified Diff: device/devices_app/usb/device_impl.h

Issue 1369643002: Add configuration and interface permission checks to DeviceImpl. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add new method ot Android USB mocks. Created 5 years, 3 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: device/devices_app/usb/device_impl.h
diff --git a/device/devices_app/usb/device_impl.h b/device/devices_app/usb/device_impl.h
index 9a7bac4ad44297a51d81f67205da161ab2580771..12d6b9071c7a1ce15fecb17a4e01e49ee57c2bb5 100644
--- a/device/devices_app/usb/device_impl.h
+++ b/device/devices_app/usb/device_impl.h
@@ -10,10 +10,11 @@
#include "base/memory/ref_counted.h"
#include "base/memory/weak_ptr.h"
#include "device/devices_app/usb/public/interfaces/device.mojom.h"
+#include "device/devices_app/usb/public/interfaces/permission_provider.mojom.h"
#include "device/usb/usb_device_handle.h"
+#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h"
#include "third_party/mojo/src/mojo/public/cpp/bindings/callback.h"
#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h"
-#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h"
namespace net {
class IOBuffer;
@@ -27,51 +28,30 @@ namespace usb {
// lifetime.
class DeviceImpl : public Device {
public:
- DeviceImpl(scoped_refptr<UsbDevice> device,
- mojo::InterfaceRequest<Device> request);
- ~DeviceImpl() override;
-
- private:
using MojoTransferInCallback =
mojo::Callback<void(TransferStatus, mojo::Array<uint8_t>)>;
using MojoTransferOutCallback = mojo::Callback<void(TransferStatus)>;
+ DeviceImpl(scoped_refptr<UsbDevice> device,
+ PermissionProviderPtr permission_provider,
+ mojo::InterfaceRequest<Device> request);
+ ~DeviceImpl() override;
+
+ private:
// Closes the device if it's open. This will always set |device_handle_| to
// null.
void CloseHandle();
+ // Checks interface permissions for control transfers.
+ void HasControlTransferPermission(ControlTransferRecipient recipient,
+ uint16_t index,
+ const base::Callback<void(bool)>& callback);
+
// Handles completion of an open request.
void OnOpen(const OpenCallback& callback,
scoped_refptr<device::UsbDeviceHandle> handle);
- // Handles completion of an inbound transfer on the UsbDeviceHandle.
- void OnTransferIn(const MojoTransferInCallback& callback,
- UsbTransferStatus status,
- scoped_refptr<net::IOBuffer> data,
- size_t size);
-
- // Handles completion of an outbound transfer on the UsbDeviceHandle.
- void OnTransferOut(const MojoTransferOutCallback& callback,
- UsbTransferStatus status,
- scoped_refptr<net::IOBuffer> data,
- size_t size);
-
- // Handles completion of an inbound isochronous transfer on the
- // UsbDeviceHandle.
- void OnIsochronousTransferIn(const IsochronousTransferInCallback& callback,
- uint32_t packet_length,
- UsbTransferStatus status,
- scoped_refptr<net::IOBuffer> data,
- size_t size);
-
- // Handles completion of an outbound isochronous transfer on the
- // UsbDeviceHandle.
- void OnIsochronousTransferOut(const MojoTransferOutCallback& callback,
- UsbTransferStatus status,
- scoped_refptr<net::IOBuffer> data,
- size_t size);
-
// Device implementation:
void GetDeviceInfo(const GetDeviceInfoCallback& callback) override;
void GetConfiguration(const GetConfigurationCallback& callback) override;
@@ -117,12 +97,13 @@ class DeviceImpl : public Device {
uint32_t timeout,
const IsochronousTransferOutCallback& callback) override;
- mojo::StrongBinding<Device> binding_;
+ mojo::Binding<Device> binding_;
scoped_refptr<UsbDevice> device_;
// The device handle. Will be null before the device is opened and after it
// has been closed.
scoped_refptr<UsbDeviceHandle> device_handle_;
+ PermissionProviderPtr permission_provider_;
base::WeakPtrFactory<DeviceImpl> weak_factory_;

Powered by Google App Engine
This is Rietveld 408576698