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

Unified Diff: chrome/browser/extensions/api/permissions/permissions_api.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
Index: chrome/browser/extensions/api/permissions/permissions_api.cc
diff --git a/chrome/browser/extensions/api/permissions/permissions_api.cc b/chrome/browser/extensions/api/permissions/permissions_api.cc
index cbaf1d9055f362b27f2567d2e3381f4fe7008bc3..0b526a8a2e076d3d490f56d0cfc189839e4d53cd 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);

Powered by Google App Engine
This is Rietveld 408576698