| Index: extensions/browser/api/hid/hid_api.h
|
| diff --git a/extensions/browser/api/hid/hid_api.h b/extensions/browser/api/hid/hid_api.h
|
| index 99824696f9b1c6bf901a9758776a6c50bd807da6..f93e2cae8083e22fa543b2d2222168aae75efea4 100644
|
| --- a/extensions/browser/api/hid/hid_api.h
|
| +++ b/extensions/browser/api/hid/hid_api.h
|
| @@ -7,11 +7,11 @@
|
|
|
| #include <stddef.h>
|
|
|
| +#include <memory>
|
| #include <string>
|
|
|
| #include "base/macros.h"
|
| #include "base/memory/ref_counted.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "extensions/browser/api/api_resource_manager.h"
|
| #include "extensions/browser/api/hid/hid_connection_resource.h"
|
| #include "extensions/browser/api/hid/hid_device_manager.h"
|
| @@ -44,7 +44,7 @@ class HidGetDevicesFunction : public UIThreadExtensionFunction {
|
| // ExtensionFunction:
|
| ResponseAction Run() override;
|
|
|
| - void OnEnumerationComplete(scoped_ptr<base::ListValue> devices);
|
| + void OnEnumerationComplete(std::unique_ptr<base::ListValue> devices);
|
|
|
| DISALLOW_COPY_AND_ASSIGN(HidGetDevicesFunction);
|
| };
|
| @@ -66,7 +66,7 @@ class HidGetUserSelectedDevicesFunction : public UIThreadExtensionFunction {
|
| const std::vector<scoped_refptr<device::HidDeviceInfo>>& devices);
|
|
|
| HidDeviceManager* device_manager_;
|
| - scoped_ptr<DevicePermissionsPrompt> prompt_;
|
| + std::unique_ptr<DevicePermissionsPrompt> prompt_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(HidGetUserSelectedDevicesFunction);
|
| };
|
| @@ -143,7 +143,7 @@ class HidReceiveFunction : public HidConnectionIoFunction {
|
| scoped_refptr<net::IOBuffer> buffer,
|
| size_t size);
|
|
|
| - scoped_ptr<api::hid::Receive::Params> parameters_;
|
| + std::unique_ptr<api::hid::Receive::Params> parameters_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(HidReceiveFunction);
|
| };
|
| @@ -163,7 +163,7 @@ class HidSendFunction : public HidConnectionIoFunction {
|
|
|
| void OnFinished(bool success);
|
|
|
| - scoped_ptr<api::hid::Send::Params> parameters_;
|
| + std::unique_ptr<api::hid::Send::Params> parameters_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(HidSendFunction);
|
| };
|
| @@ -186,7 +186,7 @@ class HidReceiveFeatureReportFunction : public HidConnectionIoFunction {
|
| scoped_refptr<net::IOBuffer> buffer,
|
| size_t size);
|
|
|
| - scoped_ptr<api::hid::ReceiveFeatureReport::Params> parameters_;
|
| + std::unique_ptr<api::hid::ReceiveFeatureReport::Params> parameters_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(HidReceiveFeatureReportFunction);
|
| };
|
| @@ -206,7 +206,7 @@ class HidSendFeatureReportFunction : public HidConnectionIoFunction {
|
|
|
| void OnFinished(bool success);
|
|
|
| - scoped_ptr<api::hid::SendFeatureReport::Params> parameters_;
|
| + std::unique_ptr<api::hid::SendFeatureReport::Params> parameters_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(HidSendFeatureReportFunction);
|
| };
|
|
|