diff options
| author | bbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-04 00:19:00 +0000 |
|---|---|---|
| committer | bbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-04 00:19:00 +0000 |
| commit | 24a6ccbb61dfad787afd8d199b9a1b278c00fa6f (patch) | |
| tree | 9fe0a149bf0855bc2aed29b57d71f5bd6c313164 /chrome/renderer/chrome_content_renderer_client.h | |
| parent | b76257d27a5916f9a2b5d80f8800ed1eef300a0b (diff) | |
| download | chromium_src-24a6ccbb61dfad787afd8d199b9a1b278c00fa6f.zip chromium_src-24a6ccbb61dfad787afd8d199b9a1b278c00fa6f.tar.gz chromium_src-24a6ccbb61dfad787afd8d199b9a1b278c00fa6f.tar.bz2 | |
Modify the IsNaClAllowed test to allow MIME type handling plugins.
The code to check whether to allow an invocation of NaCl doesn't
work correctly for content (MIME type) handlers. Change the app
URL checking code in that case.
BUG=235962
TEST=browser_tests, --gtest_filter="NaClExtensionTest.*"
R=jochen@chromium.org, jorgelo@chromium.org
Review URL: https://codereview.chromium.org/14796002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198259 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/chrome_content_renderer_client.h')
| -rw-r--r-- | chrome/renderer/chrome_content_renderer_client.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/renderer/chrome_content_renderer_client.h b/chrome/renderer/chrome_content_renderer_client.h index 2aa2b30..937f9fc 100644 --- a/chrome/renderer/chrome_content_renderer_client.h +++ b/chrome/renderer/chrome_content_renderer_client.h @@ -165,7 +165,7 @@ class ChromeContentRendererClient : public content::ContentRendererClient { static GURL GetNaClContentHandlerURL(const std::string& actual_mime_type, const webkit::WebPluginInfo& plugin); static bool IsNaClAllowed(const GURL& manifest_url, - const GURL& top_url, + const GURL& app_url, bool is_nacl_unrestricted, const extensions::Extension* extension, WebKit::WebPluginParams* params); |