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

Unified Diff: device/usb/usb_device_handle_impl.cc

Issue 1370903002: Remove unnecessary InterfaceClaimer::Claim method. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/usb/usb_device_handle_impl.cc
diff --git a/device/usb/usb_device_handle_impl.cc b/device/usb/usb_device_handle_impl.cc
index ce9e4954aa297cae50226b6df127c5eabce963bd..c02895b8ad67b60d6f56a31c5df8e5222af64eff 100644
--- a/device/usb/usb_device_handle_impl.cc
+++ b/device/usb/usb_device_handle_impl.cc
@@ -122,10 +122,8 @@ static void RunTransferCallback(
class UsbDeviceHandleImpl::InterfaceClaimer
: public base::RefCountedThreadSafe<UsbDeviceHandleImpl::InterfaceClaimer> {
public:
- InterfaceClaimer(const scoped_refptr<UsbDeviceHandleImpl> handle,
- const int interface_number);
-
- bool Claim() const;
+ InterfaceClaimer(scoped_refptr<UsbDeviceHandleImpl> handle,
+ int interface_number);
int alternate_setting() const { return alternate_setting_; }
void set_alternate_setting(const int alternate_setting) {
@@ -133,7 +131,6 @@ class UsbDeviceHandleImpl::InterfaceClaimer
}
private:
- friend class UsbDevice;
friend class base::RefCountedThreadSafe<InterfaceClaimer>;
~InterfaceClaimer();
@@ -145,26 +142,16 @@ class UsbDeviceHandleImpl::InterfaceClaimer
};
UsbDeviceHandleImpl::InterfaceClaimer::InterfaceClaimer(
- const scoped_refptr<UsbDeviceHandleImpl> handle,
- const int interface_number)
+ scoped_refptr<UsbDeviceHandleImpl> handle,
+ int interface_number)
: handle_(handle),
interface_number_(interface_number),
- alternate_setting_(0) {
-}
+ alternate_setting_(0) {}
UsbDeviceHandleImpl::InterfaceClaimer::~InterfaceClaimer() {
libusb_release_interface(handle_->handle(), interface_number_);
}
-bool UsbDeviceHandleImpl::InterfaceClaimer::Claim() const {
- const int rv = libusb_claim_interface(handle_->handle(), interface_number_);
- if (rv != LIBUSB_SUCCESS) {
- USB_LOG(EVENT) << "Failed to claim interface " << interface_number_ << ": "
- << ConvertPlatformUsbErrorToString(rv);
- }
- return rv == LIBUSB_SUCCESS;
-}
-
// This inner class owns the underlying libusb_transfer and may outlast
// the UsbDeviceHandle that created it.
class UsbDeviceHandleImpl::Transfer {
@@ -731,8 +718,8 @@ void UsbDeviceHandleImpl::ClaimInterfaceOnBlockingThread(
const ResultCallback& callback) {
int rv = libusb_claim_interface(handle_, interface_number);
if (rv != LIBUSB_SUCCESS) {
- VLOG(1) << "Failed to claim interface: "
- << ConvertPlatformUsbErrorToString(rv);
+ USB_LOG(EVENT) << "Failed to claim interface: "
+ << ConvertPlatformUsbErrorToString(rv);
}
task_runner_->PostTask(
FROM_HERE, base::Bind(&UsbDeviceHandleImpl::ClaimInterfaceComplete, this,
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698