diff options
| author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-02 21:15:09 +0000 |
|---|---|---|
| committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-02 21:15:09 +0000 |
| commit | dc24976fc87171d50b49f37bbaaa23ae53e51f4b (patch) | |
| tree | 8d7c684afa0d65e22efc3384197ef5b50d867160 /chrome/browser/extensions/permissions_updater.cc | |
| parent | fc72bb18b111ff63e57135d97de6d59291f3b7b8 (diff) | |
| download | chromium_src-dc24976fc87171d50b49f37bbaaa23ae53e51f4b.zip chromium_src-dc24976fc87171d50b49f37bbaaa23ae53e51f4b.tar.gz chromium_src-dc24976fc87171d50b49f37bbaaa23ae53e51f4b.tar.bz2 | |
Update chrome/ to use scoped_refptr<T>::get() rather than implicit "operator T*"
Linux fixes, Part 2 of N
BUG=110610
TBR=darin
Review URL: https://chromiumcodereview.appspot.com/16295003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203625 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/permissions_updater.cc')
| -rw-r--r-- | chrome/browser/extensions/permissions_updater.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/extensions/permissions_updater.cc b/chrome/browser/extensions/permissions_updater.cc index 5f441f5..02c1208 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 |