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

Unified Diff: chrome/browser/renderer_host/pepper/pepper_crx_file_system_message_filter.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/browser/chrome_content_browser_client.cc ('k') | chrome/common/pepper_permission_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/renderer_host/pepper/pepper_crx_file_system_message_filter.cc
diff --git a/chrome/browser/renderer_host/pepper/pepper_crx_file_system_message_filter.cc b/chrome/browser/renderer_host/pepper/pepper_crx_file_system_message_filter.cc
index 96f02f6f98c53cf85b46f2734f7e301255839768..6853ee5a4ab14370723390d3eb4d53fa08d73900 100644
--- a/chrome/browser/renderer_host/pepper/pepper_crx_file_system_message_filter.cc
+++ b/chrome/browser/renderer_host/pepper/pepper_crx_file_system_message_filter.cc
@@ -120,10 +120,10 @@ int32_t PepperCrxFileSystemMessageFilter::OnOpenFileSystem(
extension_set = extensions::ExtensionSystem::Get(profile)->
extension_service()->extensions();
}
- if (!IsExtensionOrSharedModuleWhitelisted(document_url_,
- extension_set,
- allowed_crxfs_origins_,
- switches::kAllowNaClCrxFsAPI)) {
+ if (!IsExtensionOrSharedModuleWhitelisted(
+ document_url_, extension_set, allowed_crxfs_origins_) &&
+ !IsHostAllowedByCommandLine(
+ document_url_, extension_set, switches::kAllowNaClCrxFsAPI)) {
LOG(ERROR) << "Host " << document_url_.host() << " cannot use CrxFs API.";
return PP_ERROR_NOACCESS;
}
« no previous file with comments | « chrome/browser/chrome_content_browser_client.cc ('k') | chrome/common/pepper_permission_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698