chrome/browser/extensions/api/media_galleries/media_galleries_api.cc - Issue 309533007: Refactor PermissionsData pt1

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/api/media_galleries/media_galleries_api.cc

Issue 309533007: Refactor PermissionsData pt1 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Latest master Created 6 years, 6 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/api/management/management_api.cc ('k') | chrome/browser/extensions/api/permissions/permissions_api.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/media_galleries/media_galleries_api.cc

diff --git a/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc b/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc

index 99b91997024669f80f5edd4062d7c41b12981122..02f6ea770c2f272b8c1eb58bb02a294c0990b220 100644

--- a/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc

+++ b/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc

@@ -132,16 +132,18 @@ base::ListValue* ConstructFileSystemList(

MediaGalleriesPermission::CheckParam read_param(

MediaGalleriesPermission::kReadPermission);

- bool has_read_permission = PermissionsData::CheckAPIPermissionWithParam(

- extension, APIPermission::kMediaGalleries, &read_param);

+ const PermissionsData* permissions_data =

+ PermissionsData::ForExtension(extension);

+ bool has_read_permission = permissions_data->CheckAPIPermissionWithParam(

+ APIPermission::kMediaGalleries, &read_param);

MediaGalleriesPermission::CheckParam copy_to_param(

MediaGalleriesPermission::kCopyToPermission);

- bool has_copy_to_permission = PermissionsData::CheckAPIPermissionWithParam(

- extension, APIPermission::kMediaGalleries, &copy_to_param);

+ bool has_copy_to_permission = permissions_data->CheckAPIPermissionWithParam(

+ APIPermission::kMediaGalleries, &copy_to_param);

MediaGalleriesPermission::CheckParam delete_param(

MediaGalleriesPermission::kDeletePermission);

- bool has_delete_permission = PermissionsData::CheckAPIPermissionWithParam(

- extension, APIPermission::kMediaGalleries, &delete_param);

+ bool has_delete_permission = permissions_data->CheckAPIPermissionWithParam(

+ APIPermission::kMediaGalleries, &delete_param);

const int child_id = rvh->GetProcess()->GetID();

scoped_ptr<base::ListValue> list(new base::ListValue());

@@ -197,8 +199,9 @@ bool CheckScanPermission(const extensions::Extension* extension,

DCHECK(error);

MediaGalleriesPermission::CheckParam scan_param(

MediaGalleriesPermission::kScanPermission);

- bool has_scan_permission = PermissionsData::CheckAPIPermissionWithParam(

- extension, APIPermission::kMediaGalleries, &scan_param);

+ bool has_scan_permission =

+ PermissionsData::ForExtension(extension)->CheckAPIPermissionWithParam(

+ APIPermission::kMediaGalleries, &scan_param);

if (!has_scan_permission)

*error = kNoScanPermission;

return has_scan_permission;