chrome/renderer/chrome_content_renderer_client.cc - Issue 17029002: Change the permission check for Pepper socket API to support both the public and private APIs.

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/renderer/chrome_content_renderer_client.cc

Issue 17029002: Change the permission check for Pepper socket API to support both the public and private APIs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 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/common/pepper_permission_util.cc ('k') | content/browser/renderer_host/pepper/pepper_host_resolver_private_message_filter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/renderer/chrome_content_renderer_client.cc

diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc

index fb2d42c31d3ebd6128d27fde3784c98635b63885..f7377f1c0c551761213824ca4021088734e01e16 100644

--- a/chrome/renderer/chrome_content_renderer_client.cc

+++ b/chrome/renderer/chrome_content_renderer_client.cc

@@ -1216,11 +1216,13 @@ bool ChromeContentRendererClient::IsPluginAllowedToCallRequestOSFileHandle(

#if defined(ENABLE_PLUGINS)

if (!container)

return false;

- return IsExtensionOrSharedModuleWhitelisted(

- container->element().document().baseURL(),

- extension_dispatcher_->extensions(),

- allowed_file_handle_origins_,

- switches::kAllowNaClFileHandleAPI);

+ GURL url = container->element().document().baseURL();

+ const ExtensionSet* extension_set = extension_dispatcher_->extensions();

+ return IsExtensionOrSharedModuleWhitelisted(url, extension_set,

+ allowed_file_handle_origins_) ||

+ IsHostAllowedByCommandLine(url, extension_set,

+ switches::kAllowNaClFileHandleAPI);

#else

return false;

#endif