summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/api/permissions/permissions_api.cc
diff options
context:
space:
mode:
authorrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-02 21:15:09 +0000
committerrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-02 21:15:09 +0000
commitdc24976fc87171d50b49f37bbaaa23ae53e51f4b (patch)
tree8d7c684afa0d65e22efc3384197ef5b50d867160 /chrome/browser/extensions/api/permissions/permissions_api.cc
parentfc72bb18b111ff63e57135d97de6d59291f3b7b8 (diff)
downloadchromium_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/api/permissions/permissions_api.cc')
-rw-r--r--chrome/browser/extensions/api/permissions/permissions_api.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/extensions/api/permissions/permissions_api.cc b/chrome/browser/extensions/api/permissions/permissions_api.cc
index cbaf1d9..0b526a8 100644
--- a/chrome/browser/extensions/api/permissions/permissions_api.cc
+++ b/chrome/browser/extensions/api/permissions/permissions_api.cc
@@ -62,7 +62,7 @@ bool PermissionsContainsFunction::RunImpl() {
return false;
results_ = Contains::Results::Create(
- GetExtension()->GetActivePermissions()->Contains(*permissions));
+ GetExtension()->GetActivePermissions()->Contains(*permissions.get()));
return true;
}
@@ -181,8 +181,8 @@ bool PermissionsRequestFunction::RunImpl() {
requested_permissions_.get());
// The requested permissions must be defined as optional in the manifest.
- if (!PermissionsData::GetOptionalPermissions(GetExtension())->Contains(
- *manifest_required_requested_permissions)) {
+ if (!PermissionsData::GetOptionalPermissions(GetExtension())
+ ->Contains(*manifest_required_requested_permissions.get())) {
error_ = kNotInOptionalPermissionsError;
return false;
}
@@ -192,7 +192,7 @@ bool PermissionsRequestFunction::RunImpl() {
scoped_refptr<const PermissionSet> granted =
ExtensionPrefs::Get(profile_)->
GetGrantedPermissions(GetExtension()->id());
- if (granted && granted->Contains(*requested_permissions_)) {
+ if (granted.get() && granted->Contains(*requested_permissions_.get())) {
PermissionsUpdater perms_updater(profile());
perms_updater.AddPermissions(GetExtension(), requested_permissions_.get());
results_ = Request::Results::Create(true);