Index: chrome/browser/extensions/api/usb/usb_api.h |
diff --git a/chrome/browser/extensions/api/usb/usb_api.h b/chrome/browser/extensions/api/usb/usb_api.h |
index 261f7dcdedcfbbe03ad4056ab532a92f71248913..9262eca6963ac59a7cef4f44d3d8b70258a490d7 100644 |
--- a/chrome/browser/extensions/api/usb/usb_api.h |
+++ b/chrome/browser/extensions/api/usb/usb_api.h |
@@ -10,10 +10,10 @@ |
#include "base/memory/ref_counted.h" |
#include "base/memory/scoped_ptr.h" |
-#include "chrome/browser/extensions/api/api_resource_manager.h" |
#include "chrome/browser/usb/usb_device.h" |
#include "chrome/browser/usb/usb_device_handle.h" |
#include "chrome/common/extensions/api/usb.h" |
+#include "extensions/browser/api/api_resource_manager.h" |
#include "extensions/browser/api/async_api_function.h" |
#include "net/base/io_buffer.h" |
@@ -56,7 +56,7 @@ class UsbAsyncApiTransferFunction : public UsbAsyncApiFunction { |
bool ConvertDirectionSafely(const extensions::api::usb::Direction& input, |
UsbEndpointDirection* output); |
bool ConvertRequestTypeSafely(const extensions::api::usb::RequestType& input, |
- UsbDeviceHandle::TransferRequestType* output); |
+ UsbDeviceHandle::TransferRequestType* output); |
bool ConvertRecipientSafely(const extensions::api::usb::Recipient& input, |
UsbDeviceHandle::TransferRecipient* output); |
@@ -159,7 +159,7 @@ class UsbListInterfacesFunction : public UsbAsyncApiFunction { |
const UsbSynchronizationType& input, |
extensions::api::usb::SynchronizationType* output); |
bool ConvertTransferTypeSafely(const UsbTransferType& input, |
- extensions::api::usb::TransferType* output); |
+ extensions::api::usb::TransferType* output); |
bool ConvertUsageTypeSafely(const UsbUsageType& input, |
extensions::api::usb::UsageType* output); |
@@ -261,8 +261,7 @@ class UsbBulkTransferFunction : public UsbAsyncApiTransferFunction { |
virtual void AsyncWorkStart() OVERRIDE; |
private: |
- scoped_ptr<extensions::api::usb::BulkTransfer::Params> |
- parameters_; |
+ scoped_ptr<extensions::api::usb::BulkTransfer::Params> parameters_; |
}; |
class UsbInterruptTransferFunction : public UsbAsyncApiTransferFunction { |