chrome/browser/extensions/permissions_updater.cc - Issue 16295003: Update chrome/ to use scoped_refptr<T>::get() rather than implicit "operator T*"

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/extensions/permissions_updater.cc

Issue 16295003: Update chrome/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebased Created 7 years, 7 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

« no previous file with comments | « chrome/browser/extensions/page_action_controller_unittest.cc ('k') | chrome/browser/extensions/permissions_updater_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/permissions_updater.cc

diff --git a/chrome/browser/extensions/permissions_updater.cc b/chrome/browser/extensions/permissions_updater.cc

index 5f441f5db32742a7e6f8d97323aa921aa5ad2ae5..02c120808b250401734f8a750b23bc5c2665404a 100644

--- a/chrome/browser/extensions/permissions_updater.cc

+++ b/chrome/browser/extensions/permissions_updater.cc

@@ -44,9 +44,9 @@ void PermissionsUpdater::AddPermissions(

scoped_refptr<const PermissionSet> existing(

extension->GetActivePermissions());

scoped_refptr<PermissionSet> total(

- PermissionSet::CreateUnion(existing, permissions));

+ PermissionSet::CreateUnion(existing.get(), permissions));

scoped_refptr<PermissionSet> added(

- PermissionSet::CreateDifference(total.get(), existing));

+ PermissionSet::CreateDifference(total.get(), existing.get()));

UpdateActivePermissions(extension, total.get());

@@ -61,9 +61,9 @@ void PermissionsUpdater::RemovePermissions(

scoped_refptr<const PermissionSet> existing(

extension->GetActivePermissions());

scoped_refptr<PermissionSet> total(

- PermissionSet::CreateDifference(existing, permissions));

+ PermissionSet::CreateDifference(existing.get(), permissions));

scoped_refptr<PermissionSet> removed(

- PermissionSet::CreateDifference(existing, total.get()));

+ PermissionSet::CreateDifference(existing.get(), total.get()));

// We update the active permissions, and not the granted permissions, because

// the extension, not the user, removed the permissions. This allows the