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

Unified Diff: chrome/browser/extensions/extension_service.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/extension_service.cc
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
index 0f976b895a63e7df8336d64cf586129c66670b83..45ab9b62de4e571009395dd4430445f56b92e667 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -1001,7 +1001,7 @@ void ExtensionService::RecordPermissionMessagesHistogram(
PermissionIDSet permissions =
extensions::PermissionMessageProvider::Get()->GetAllPermissionIDs(
- extension->permissions_data()->active_permissions().get(),
+ extension->permissions_data()->active_permissions(),
extension->GetType());
counter_has_any->AddBoolean(!permissions.empty());
for (const PermissionID& id : permissions)
@@ -1602,7 +1602,7 @@ void ExtensionService::CheckPermissionsIncrease(const Extension* extension,
if (extension->location() == Manifest::INTERNAL && !auto_grant_permission) {
// Add all the recognized permissions if the granted permissions list
// hasn't been initialized yet.
- scoped_refptr<const PermissionSet> granted_permissions =
+ scoped_ptr<const PermissionSet> granted_permissions =
extension_prefs_->GetGrantedPermissions(extension->id());
CHECK(granted_permissions.get());
@@ -1613,7 +1613,7 @@ void ExtensionService::CheckPermissionsIncrease(const Extension* extension,
is_privilege_increase =
extensions::PermissionMessageProvider::Get()->IsPrivilegeIncrease(
granted_permissions.get(),
- extension->permissions_data()->active_permissions().get(),
+ extension->permissions_data()->active_permissions(),
extension->GetType());
}
@@ -1848,7 +1848,7 @@ void ExtensionService::OnExtensionManagementSettingsChanged() {
for (const auto& extension : *all_extensions.get()) {
if (!settings->IsPermissionSetAllowed(
extension.get(),
- extension->permissions_data()->active_permissions())) {
+ *extension->permissions_data()->active_permissions())) {
extensions::PermissionsUpdater(profile()).RemovePermissionsUnsafe(
extension.get(),
settings->GetBlockedPermissions(extension.get()).get());
« no previous file with comments | « chrome/browser/extensions/extension_prefs_unittest.cc ('k') | chrome/browser/extensions/extension_service_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698