| Index: chrome/browser/extensions/api/usb/usb_device_resource.h
|
| diff --git a/chrome/browser/extensions/api/usb/usb_device_resource.h b/chrome/browser/extensions/api/usb/usb_device_resource.h
|
| index fd6e7ce3b5e1ee030ff4b1df25ae1f43239bff9e..b959dafd367f09f6f23c551f7b1269c4dc0cc045 100644
|
| --- a/chrome/browser/extensions/api/usb/usb_device_resource.h
|
| +++ b/chrome/browser/extensions/api/usb/usb_device_resource.h
|
| @@ -12,11 +12,11 @@
|
| #include "base/memory/linked_ptr.h"
|
| #include "base/memory/ref_counted.h"
|
| #include "base/synchronization/lock.h"
|
| -#include "chrome/browser/extensions/api/api_resource.h"
|
| -#include "chrome/browser/extensions/api/api_resource_manager.h"
|
| #include "chrome/browser/usb/usb_device_handle.h"
|
| #include "chrome/common/extensions/api/usb.h"
|
| #include "content/public/browser/browser_thread.h"
|
| +#include "extensions/browser/api/api_resource.h"
|
| +#include "extensions/browser/api/api_resource_manager.h"
|
|
|
| class UsbDeviceHandle;
|
|
|
| @@ -33,18 +33,14 @@ class UsbDeviceResource : public ApiResource {
|
| scoped_refptr<UsbDeviceHandle> device);
|
| virtual ~UsbDeviceResource();
|
|
|
| - scoped_refptr<UsbDeviceHandle> device() {
|
| - return device_;
|
| - }
|
| + scoped_refptr<UsbDeviceHandle> device() { return device_; }
|
|
|
| static const content::BrowserThread::ID kThreadId =
|
| content::BrowserThread::FILE;
|
|
|
| private:
|
| friend class ApiResourceManager<UsbDeviceResource>;
|
| - static const char* service_name() {
|
| - return "UsbDeviceResourceManager";
|
| - }
|
| + static const char* service_name() { return "UsbDeviceResourceManager"; }
|
|
|
| scoped_refptr<UsbDeviceHandle> device_;
|
|
|
|
|