diff options
| author | bbudge@google.com <bbudge@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-25 22:19:58 +0000 |
|---|---|---|
| committer | bbudge@google.com <bbudge@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-25 22:19:58 +0000 |
| commit | e5bc930c3e26323906553e3fc93330d14a45b744 (patch) | |
| tree | 1d4201a529fc9b8e67b41d7849eb6db71a6ca91e /chrome/renderer | |
| parent | 787b4e62a849e2686f483eeb0271cde6455c1329 (diff) | |
| download | chromium_src-e5bc930c3e26323906553e3fc93330d14a45b744.zip chromium_src-e5bc930c3e26323906553e3fc93330d14a45b744.tar.gz chromium_src-e5bc930c3e26323906553e3fc93330d14a45b744.tar.bz2 | |
Enable Native Client for the external plugins which handle Native Client mime type.
This is a clone of http://codereview.chromium.org/8341029/
Creating a new issue so it can be committed as it's blocking a NaCl DEPS roll.
TBR=jam@chromium.org
Review URL: http://codereview.chromium.org/8391023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107215 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
| -rw-r--r-- | chrome/renderer/chrome_content_renderer_client.cc | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc index 7b7b3d2..03ea570 100644 --- a/chrome/renderer/chrome_content_renderer_client.cc +++ b/chrome/renderer/chrome_content_renderer_client.cc @@ -426,12 +426,21 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( // tests will still pass. const char* kNaClMimeType = "application/x-nacl"; bool is_nacl_mime_type = actual_mime_type == kNaClMimeType; + bool is_nacl_enabled; + if (is_nacl_plugin) { + is_nacl_enabled = cmd->HasSwitch(switches::kEnableNaCl); + } else { + // If this is an external plugin that handles NaCl mime type, + // we want to allow Native Client, because it's how + // NaCl tests for the plugin work. + is_nacl_enabled = true; + } if (is_nacl_plugin || is_nacl_mime_type) { if (!IsNaClAllowed(plugin, url, actual_mime_type, is_nacl_mime_type, - cmd->HasSwitch(switches::kEnableNaCl), + is_nacl_enabled, params)) { return CreatePluginPlaceholder( render_view, frame, plugin, params, group.get(), |