extensions/common/permissions/permissions_data.cc - Issue 503873002: Remove implicit conversions from scoped_refptr to T* in extensions/

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: extensions/common/permissions/permissions_data.cc

Issue 503873002: Remove implicit conversions from scoped_refptr to T* in extensions/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 4 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 | « extensions/common/manifest_handlers/file_handler_manifest_unittest.cc ('k') | extensions/common/permissions/permissions_data_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: extensions/common/permissions/permissions_data.cc

diff --git a/extensions/common/permissions/permissions_data.cc b/extensions/common/permissions/permissions_data.cc

index 958c5e95a410afaf79acecd13e8e34debda0dae4..50c25f0eb29ae21a59cd7eedd60cdd4a99ec799e 100644

--- a/extensions/common/permissions/permissions_data.cc

+++ b/extensions/common/permissions/permissions_data.cc

@@ -130,7 +130,8 @@ void PermissionsData::UpdateTabSpecificPermissions(

if (iter == tab_specific_permissions_.end())

tab_specific_permissions_[tab_id] = permissions;

else

- iter->second = PermissionSet::CreateUnion(iter->second, permissions);

+ iter->second =

+ PermissionSet::CreateUnion(iter->second.get(), permissions.get());

}

void PermissionsData::ClearTabSpecificPermissions(int tab_id) const {

@@ -294,7 +295,7 @@ bool PermissionsData::CanCaptureVisiblePage(int tab_id,

if (tab_id >= 0) {

scoped_refptr<const PermissionSet> tab_permissions =

GetTabSpecificPermissions(tab_id);

- if (tab_permissions &&

+ if (tab_permissions.get() &&

tab_permissions->HasAPIPermission(APIPermission::kTab)) {

return true;

}