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

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

Issue 1349613003: [Extensions] Un-refcount PermissionSet (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 3 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_helpers.cc
diff --git a/chrome/browser/extensions/api/permissions/permissions_api_helpers.cc b/chrome/browser/extensions/api/permissions/permissions_api_helpers.cc
index 71fb3ea3ad03b4df6f73935f3218d467c6d7278b..298ece3f94382455a0f12409ad813850c428e3cd 100644
--- a/chrome/browser/extensions/api/permissions/permissions_api_helpers.cc
+++ b/chrome/browser/extensions/api/permissions/permissions_api_helpers.cc
@@ -15,10 +15,6 @@
#include "extensions/common/permissions/usb_device_permission.h"
#include "extensions/common/url_pattern_set.h"
-using extensions::APIPermission;
-using extensions::PermissionSet;
-using extensions::PermissionsInfo;
-
namespace extensions {
using api::permissions::Permissions;
@@ -67,7 +63,7 @@ scoped_ptr<Permissions> PackPermissionSet(const PermissionSet* set) {
return scoped_ptr<Permissions>(permissions);
}
-scoped_refptr<const PermissionSet> UnpackPermissionSet(
+scoped_ptr<const PermissionSet> UnpackPermissionSet(
const Permissions& permissions,
bool allow_file_access,
std::string* error) {
@@ -149,7 +145,7 @@ scoped_refptr<const PermissionSet> UnpackPermissionSet(
}
}
- return make_scoped_refptr(
+ return make_scoped_ptr(
new PermissionSet(apis, manifest_permissions, origins, URLPatternSet()));
}

Powered by Google App Engine
This is Rietveld 408576698