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

Unified Diff: extensions/browser/api/device_permissions_prompt.cc

Issue 1902873002: Convert //extensions/browser/api from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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
Index: extensions/browser/api/device_permissions_prompt.cc
diff --git a/extensions/browser/api/device_permissions_prompt.cc b/extensions/browser/api/device_permissions_prompt.cc
index e29ae85d97e9e1656ab2cf42a0ec9fed64318752..4a6c0e6186410976c73558a24f2af94662472d6b 100644
--- a/extensions/browser/api/device_permissions_prompt.cc
+++ b/extensions/browser/api/device_permissions_prompt.cc
@@ -130,7 +130,7 @@ class UsbDevicePermissionsPrompt : public DevicePermissionsPrompt::Prompt,
return;
}
- scoped_ptr<DeviceInfo> device_info(new UsbDeviceInfo(device));
+ std::unique_ptr<DeviceInfo> device_info(new UsbDeviceInfo(device));
device->CheckUsbAccess(
base::Bind(&UsbDevicePermissionsPrompt::AddCheckedDevice, this,
base::Passed(&device_info)));
@@ -243,7 +243,7 @@ class HidDevicePermissionsPrompt : public DevicePermissionsPrompt::Prompt,
void OnDeviceAdded(scoped_refptr<device::HidDeviceInfo> device) override {
if (HasUnprotectedCollections(device) &&
(filters_.empty() || HidDeviceFilter::MatchesAny(device, filters_))) {
- scoped_ptr<DeviceInfo> device_info(new HidDeviceInfo(device));
+ std::unique_ptr<DeviceInfo> device_info(new HidDeviceInfo(device));
#if defined(OS_CHROMEOS)
chromeos::PermissionBrokerClient* client =
chromeos::DBusThreadManager::Get()->GetPermissionBrokerClient();
@@ -343,7 +343,7 @@ DevicePermissionsPrompt::Prompt::~Prompt() {
}
void DevicePermissionsPrompt::Prompt::AddCheckedDevice(
- scoped_ptr<DeviceInfo> device,
+ std::unique_ptr<DeviceInfo> device,
bool allowed) {
if (allowed) {
devices_.push_back(std::move(device));
« no previous file with comments | « extensions/browser/api/device_permissions_prompt.h ('k') | extensions/browser/api/diagnostics/diagnostics_api.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698