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

Unified Diff: chrome/browser/extensions/api/permissions/permissions_api.cc

Issue 1871713002: Convert //chrome/browser/extensions from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase and fix header 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: chrome/browser/extensions/api/permissions/permissions_api.cc
diff --git a/chrome/browser/extensions/api/permissions/permissions_api.cc b/chrome/browser/extensions/api/permissions/permissions_api.cc
index 464b0f6e46962db4c52e6558b9e2716d1fb7c2a8..d360d220ee04cf0325744e9b4697fa08845335cd 100644
--- a/chrome/browser/extensions/api/permissions/permissions_api.cc
+++ b/chrome/browser/extensions/api/permissions/permissions_api.cc
@@ -4,7 +4,9 @@
#include "chrome/browser/extensions/api/permissions/permissions_api.h"
-#include "base/memory/scoped_ptr.h"
+#include <memory>
+
+#include "base/memory/ptr_util.h"
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/extensions/api/permissions/permissions_api_helpers.h"
#include "chrome/browser/extensions/extension_management.h"
@@ -53,13 +55,14 @@ bool ignore_user_gesture_for_tests = false;
} // namespace
bool PermissionsContainsFunction::RunSync() {
- scoped_ptr<Contains::Params> params(Contains::Params::Create(*args_));
+ std::unique_ptr<Contains::Params> params(Contains::Params::Create(*args_));
EXTENSION_FUNCTION_VALIDATE(params);
- scoped_ptr<const PermissionSet> permissions = helpers::UnpackPermissionSet(
- params->permissions,
- ExtensionPrefs::Get(GetProfile())->AllowFileAccess(extension_->id()),
- &error_);
+ std::unique_ptr<const PermissionSet> permissions =
+ helpers::UnpackPermissionSet(
+ params->permissions,
+ ExtensionPrefs::Get(GetProfile())->AllowFileAccess(extension_->id()),
+ &error_);
if (!permissions.get())
return false;
@@ -70,20 +73,21 @@ bool PermissionsContainsFunction::RunSync() {
}
bool PermissionsGetAllFunction::RunSync() {
- scoped_ptr<Permissions> permissions = helpers::PackPermissionSet(
+ std::unique_ptr<Permissions> permissions = helpers::PackPermissionSet(
extension()->permissions_data()->active_permissions());
results_ = GetAll::Results::Create(*permissions);
return true;
}
bool PermissionsRemoveFunction::RunSync() {
- scoped_ptr<Remove::Params> params(Remove::Params::Create(*args_));
+ std::unique_ptr<Remove::Params> params(Remove::Params::Create(*args_));
EXTENSION_FUNCTION_VALIDATE(params);
- scoped_ptr<const PermissionSet> permissions = helpers::UnpackPermissionSet(
- params->permissions,
- ExtensionPrefs::Get(GetProfile())->AllowFileAccess(extension_->id()),
- &error_);
+ std::unique_ptr<const PermissionSet> permissions =
+ helpers::UnpackPermissionSet(
+ params->permissions,
+ ExtensionPrefs::Get(GetProfile())->AllowFileAccess(extension_->id()),
+ &error_);
if (!permissions.get())
return false;
@@ -108,7 +112,7 @@ bool PermissionsRemoveFunction::RunSync() {
const PermissionSet& required =
PermissionsParser::GetRequiredPermissions(extension());
if (!optional.Contains(*permissions) ||
- !scoped_ptr<const PermissionSet>(
+ !std::unique_ptr<const PermissionSet>(
PermissionSet::CreateIntersection(*permissions, required))
->IsEmpty()) {
error_ = kCantRemoveRequiredPermissionsError;
@@ -153,7 +157,7 @@ bool PermissionsRequestFunction::RunAsync() {
return false;
}
- scoped_ptr<Request::Params> params(Request::Params::Create(*args_));
+ std::unique_ptr<Request::Params> params(Request::Params::Create(*args_));
EXTENSION_FUNCTION_VALIDATE(params);
requested_permissions_ = helpers::UnpackPermissionSet(
@@ -191,7 +195,7 @@ bool PermissionsRequestFunction::RunAsync() {
// We don't need to prompt the user if the requested permissions are a subset
// of the granted permissions set.
- scoped_ptr<const PermissionSet> granted =
+ std::unique_ptr<const PermissionSet> granted =
ExtensionPrefs::Get(GetProfile())
->GetGrantedPermissions(extension()->id());
if (granted.get() && granted->Contains(*requested_permissions_)) {
@@ -235,7 +239,7 @@ bool PermissionsRequestFunction::RunAsync() {
install_ui_->ShowDialog(
base::Bind(&PermissionsRequestFunction::OnInstallPromptDone, this),
extension(), nullptr,
- make_scoped_ptr(new ExtensionInstallPrompt::Prompt(
+ base::WrapUnique(new ExtensionInstallPrompt::Prompt(
ExtensionInstallPrompt::PERMISSIONS_PROMPT)),
requested_permissions_->Clone(),
ExtensionInstallPrompt::GetDefaultShowDialogCallback());

Powered by Google App Engine
This is Rietveld 408576698