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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/renderer/chrome_content_renderer_client.cc

Issue 12612011: Allow NaCl plugin to be loaded from hosted app URLs. (Closed) Base URL: https://src.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 9 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/extension_nacl_browsertest.cc ('k') | chrome/test/data/extensions/native_client_hosted_app/manifest.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/chrome_content_renderer_client.cc
===================================================================
--- chrome/renderer/chrome_content_renderer_client.cc (revision 187306)
+++ chrome/renderer/chrome_content_renderer_client.cc (working copy)
@@ -546,7 +546,11 @@
(extension->location() == extensions::Manifest::COMPONENT ||
extensions::Manifest::IsUnpackedLocation(extension->location()));
GURL top_url = frame->top()->document().url();
- if (!IsNaClAllowed(manifest_url,
+ bool is_invoked_by_hosted_app = extension &&
+ extension->is_hosted_app() &&
+ extension->web_extent().MatchesURL(top_url);
+ if (!is_invoked_by_hosted_app &&
Matt Perry 2013/03/12 22:23:22 I would pass |extension| as a parameter to IsNaclA
+ !IsNaClAllowed(manifest_url,
top_url,
is_nacl_unrestricted,
is_extension_unrestricted,
« no previous file with comments | « chrome/browser/extensions/extension_nacl_browsertest.cc ('k') | chrome/test/data/extensions/native_client_hosted_app/manifest.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698