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

Unified Diff: chrome/browser/usb/usb_interface.h

Issue 16316004: Separate usb device handle from usb device. (deprecate) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix the threading mess Created 7 years, 6 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
« no previous file with comments | « chrome/browser/usb/usb_device_handle.cc ('k') | chrome/browser/usb/usb_interface.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/usb/usb_interface.h
diff --git a/chrome/browser/usb/usb_interface.h b/chrome/browser/usb/usb_interface.h
index eb57f92197be61bdf76992a22121c6d198606503..2a8b2278a8b2cd5e588c35fed28ac33dbd93bb44 100644
--- a/chrome/browser/usb/usb_interface.h
+++ b/chrome/browser/usb/usb_interface.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2013 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -18,8 +18,6 @@ typedef const libusb_endpoint_descriptor* PlatformUsbEndpointDescriptor;
typedef const libusb_interface* PlatformUsbInterface;
typedef const libusb_interface_descriptor* PlatformUsbInterfaceDescriptor;
-class UsbDevice;
-
enum UsbTransferType {
USB_TRANSFER_CONTROL = 0,
USB_TRANSFER_ISOCHRONOUS,
@@ -50,7 +48,7 @@ class UsbConfigDescriptor;
class UsbEndpointDescriptor : public base::RefCounted<UsbEndpointDescriptor> {
public:
UsbEndpointDescriptor(scoped_refptr<const UsbConfigDescriptor> config,
- PlatformUsbEndpointDescriptor descriptor);
+ PlatformUsbEndpointDescriptor descriptor);
int GetAddress() const;
UsbEndpointDirection GetDirection() const;
@@ -68,15 +66,13 @@ class UsbEndpointDescriptor : public base::RefCounted<UsbEndpointDescriptor> {
PlatformUsbEndpointDescriptor descriptor_;
};
-class UsbInterfaceDescriptor
- : public base::RefCounted<UsbInterfaceDescriptor> {
+class UsbInterfaceDescriptor : public base::RefCounted<UsbInterfaceDescriptor> {
public:
UsbInterfaceDescriptor(scoped_refptr<const UsbConfigDescriptor> config,
- PlatformUsbInterfaceDescriptor descriptor);
+ PlatformUsbInterfaceDescriptor descriptor);
size_t GetNumEndpoints() const;
- scoped_refptr<const UsbEndpointDescriptor>
- GetEndpoint(size_t index) const;
+ scoped_refptr<const UsbEndpointDescriptor> GetEndpoint(size_t index) const;
int GetInterfaceNumber() const;
int GetAlternateSetting() const;
@@ -95,11 +91,10 @@ class UsbInterfaceDescriptor
class UsbInterface : public base::RefCounted<UsbInterface> {
public:
UsbInterface(scoped_refptr<const UsbConfigDescriptor> config,
- PlatformUsbInterface usbInterface);
+ PlatformUsbInterface usbInterface);
size_t GetNumAltSettings() const;
- scoped_refptr<const UsbInterfaceDescriptor>
- GetAltSetting(size_t index) const;
+ scoped_refptr<const UsbInterfaceDescriptor> GetAltSetting(size_t index) const;
private:
friend class base::RefCounted<UsbInterface>;
@@ -117,8 +112,7 @@ class UsbConfigDescriptor : public base::RefCounted<UsbConfigDescriptor> {
size_t GetNumInterfaces() const;
- scoped_refptr<const UsbInterface>
- GetInterface(size_t index) const;
+ scoped_refptr<const UsbInterface> GetInterface(size_t index) const;
private:
friend class base::RefCounted<UsbConfigDescriptor>;
« no previous file with comments | « chrome/browser/usb/usb_device_handle.cc ('k') | chrome/browser/usb/usb_interface.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698