| Index: extensions/browser/api/hid/hid_api.h
|
| diff --git a/chrome/browser/extensions/api/hid/hid_api.h b/extensions/browser/api/hid/hid_api.h
|
| similarity index 83%
|
| rename from chrome/browser/extensions/api/hid/hid_api.h
|
| rename to extensions/browser/api/hid/hid_api.h
|
| index 6d4b14d23357927d3bbb1235a1441bd9335a3385..d9ea2de858a8991d881f107b3e3099c05946ec4c 100644
|
| --- a/chrome/browser/extensions/api/hid/hid_api.h
|
| +++ b/extensions/browser/api/hid/hid_api.h
|
| @@ -2,18 +2,18 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CHROME_BROWSER_EXTENSIONS_API_HID_HID_API_H_
|
| -#define CHROME_BROWSER_EXTENSIONS_API_HID_HID_API_H_
|
| +#ifndef EXTENSIONS_BROWSER_API_HID_HID_API_H_
|
| +#define EXTENSIONS_BROWSER_API_HID_HID_API_H_
|
|
|
| #include <string>
|
|
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/scoped_ptr.h"
|
| -#include "chrome/browser/extensions/api/hid/hid_connection_resource.h"
|
| -#include "chrome/browser/extensions/api/hid/hid_device_manager.h"
|
| -#include "chrome/common/extensions/api/hid.h"
|
| #include "extensions/browser/api/api_resource_manager.h"
|
| #include "extensions/browser/api/async_api_function.h"
|
| +#include "extensions/browser/api/hid/hid_connection_resource.h"
|
| +#include "extensions/browser/api/hid/hid_device_manager.h"
|
| +#include "extensions/common/api/hid.h"
|
|
|
| namespace net {
|
|
|
| @@ -58,7 +58,7 @@ class HidGetDevicesFunction : public HidAsyncApiFunction {
|
| virtual ~HidGetDevicesFunction();
|
|
|
| scoped_ptr<base::ListValue> result_;
|
| - scoped_ptr<extensions::api::hid::GetDevices::Params> parameters_;
|
| + scoped_ptr<core_api::hid::GetDevices::Params> parameters_;
|
|
|
| private:
|
| DISALLOW_COPY_AND_ASSIGN(HidGetDevicesFunction);
|
| @@ -78,7 +78,7 @@ class HidConnectFunction : public HidAsyncApiFunction {
|
| virtual ~HidConnectFunction();
|
|
|
| scoped_ptr<base::ListValue> result_;
|
| - scoped_ptr<extensions::api::hid::Connect::Params> parameters_;
|
| + scoped_ptr<core_api::hid::Connect::Params> parameters_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(HidConnectFunction);
|
| };
|
| @@ -97,7 +97,7 @@ class HidDisconnectFunction : public HidAsyncApiFunction {
|
| virtual ~HidDisconnectFunction();
|
|
|
| scoped_ptr<base::ListValue> result_;
|
| - scoped_ptr<extensions::api::hid::Disconnect::Params> parameters_;
|
| + scoped_ptr<core_api::hid::Disconnect::Params> parameters_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(HidDisconnectFunction);
|
| };
|
| @@ -119,7 +119,7 @@ class HidReceiveFunction : public HidAsyncApiFunction {
|
|
|
| scoped_refptr<net::IOBufferWithSize> buffer_;
|
| scoped_ptr<base::ListValue> result_;
|
| - scoped_ptr<extensions::api::hid::Receive::Params> parameters_;
|
| + scoped_ptr<core_api::hid::Receive::Params> parameters_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(HidReceiveFunction);
|
| };
|
| @@ -140,7 +140,7 @@ class HidSendFunction : public HidAsyncApiFunction {
|
| void OnFinished(bool success, size_t bytes);
|
|
|
| scoped_ptr<base::ListValue> result_;
|
| - scoped_ptr<extensions::api::hid::Send::Params> parameters_;
|
| + scoped_ptr<core_api::hid::Send::Params> parameters_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(HidSendFunction);
|
| };
|
| @@ -163,7 +163,7 @@ class HidReceiveFeatureReportFunction : public HidAsyncApiFunction {
|
|
|
| scoped_refptr<net::IOBufferWithSize> buffer_;
|
| scoped_ptr<base::ListValue> result_;
|
| - scoped_ptr<extensions::api::hid::ReceiveFeatureReport::Params> parameters_;
|
| + scoped_ptr<core_api::hid::ReceiveFeatureReport::Params> parameters_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(HidReceiveFeatureReportFunction);
|
| };
|
| @@ -184,11 +184,11 @@ class HidSendFeatureReportFunction : public HidAsyncApiFunction {
|
| void OnFinished(bool success, size_t bytes);
|
|
|
| scoped_ptr<base::ListValue> result_;
|
| - scoped_ptr<extensions::api::hid::SendFeatureReport::Params> parameters_;
|
| + scoped_ptr<core_api::hid::SendFeatureReport::Params> parameters_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(HidSendFeatureReportFunction);
|
| };
|
|
|
| } // namespace extensions
|
|
|
| -#endif // CHROME_BROWSER_EXTENSIONS_API_HID_HID_API_H_
|
| +#endif // EXTENSIONS_BROWSER_API_HID_HID_API_H_
|
|
|