Index: chrome/browser/extensions/api/media_gallery/media_gallery_api.cc |
diff --git a/chrome/browser/extensions/api/media_gallery/media_gallery_api.cc b/chrome/browser/extensions/api/media_gallery/media_gallery_api.cc |
index 15698f6081fcc0582d9248ec50199fa61e7e28ee..5152ca0224bcefe0f8e5c4444137fdfbcf2e7831 100644 |
--- a/chrome/browser/extensions/api/media_gallery/media_gallery_api.cc |
+++ b/chrome/browser/extensions/api/media_gallery/media_gallery_api.cc |
@@ -28,6 +28,16 @@ using content::ChildProcessSecurityPolicy; |
GetMediaFileSystemsFunction::~GetMediaFileSystemsFunction() {} |
bool GetMediaFileSystemsFunction::RunImpl() { |
+ bool read_permission = GetExtension()->HasAPIPermission( |
+ extensions::APIPermission::kMediaGalleriesRead); |
+ bool write_permission = GetExtension()->HasAPIPermission( |
+ extensions::APIPermission::kMediaGalleriesWrite); |
+ if (!read_permission && !write_permission) { |
+ base::ListValue* list = new base::ListValue(); |
+ SetResult(list); |
Evan Stade
2012/07/18 05:11:00
I think the typical thing is SetResult(false). Als
vandebo (ex-Chrome)
2012/07/18 22:43:32
Done.
|
+ return true; |
+ } |
+ |
const content::RenderProcessHost* rph = render_view_host()->GetProcess(); |
chrome::MediaFileSystemRegistry* media_fs_registry = |
MediaFileSystemRegistry::GetInstance(); |
@@ -52,11 +62,14 @@ bool GetMediaFileSystemsFunction::RunImpl() { |
"dirname", Value::CreateStringValue("_")); |
list->Append(dict_value); |
- content::ChildProcessSecurityPolicy* policy = |
- ChildProcessSecurityPolicy::GetInstance(); |
- if (!policy->CanReadFile(child_id, path)) |
- policy->GrantReadFile(child_id, path); |
- policy->GrantReadFileSystem(child_id, fsid); |
+ if (read_permission) { |
+ content::ChildProcessSecurityPolicy* policy = |
+ ChildProcessSecurityPolicy::GetInstance(); |
+ if (!policy->CanReadFile(child_id, path)) |
+ policy->GrantReadFile(child_id, path); |
+ policy->GrantReadFileSystem(child_id, fsid); |
+ } |
+ // TODO(vandebo) Handle write permission. |
} |
SetResult(list); |