diff options
| author | elijahtaylor@google.com <elijahtaylor@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-18 08:25:19 +0000 |
|---|---|---|
| committer | elijahtaylor@google.com <elijahtaylor@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-18 08:25:19 +0000 |
| commit | 87b576887a6339451a33c67e43361a18189a7e04 (patch) | |
| tree | 96f210705ddf188a0cae082645f7d1417ab5458c | |
| parent | 4ec2c7b57f4dfe89602a68a638b3141fbba15b95 (diff) | |
| download | chromium_src-87b576887a6339451a33c67e43361a18189a7e04.zip chromium_src-87b576887a6339451a33c67e43361a18189a7e04.tar.gz chromium_src-87b576887a6339451a33c67e43361a18189a7e04.tar.bz2 | |
Disable NaCl on 32-bit linux
BUG= 93165
TEST= manual
Review URL: http://codereview.chromium.org/7670055
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97285 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/renderer/chrome_content_renderer_client.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc index 614835e..096f1ea 100644 --- a/chrome/renderer/chrome_content_renderer_client.cc +++ b/chrome/renderer/chrome_content_renderer_client.cc @@ -98,9 +98,6 @@ using WebKit::WebVector; namespace { -const char* kNaClPluginMimeType = "application/x-nacl"; -const char* kNaClPluginManifestAttribute = "nacl"; - // Constants for UMA statistic collection. static const char kPluginTypeMismatch[] = "Plugin.PluginTypeMismatch"; static const char kApplicationOctetStream[] = "application/octet-stream"; @@ -400,7 +397,12 @@ WebPlugin* ChromeContentRendererClient::CreatePluginImpl( // Enforce Chrome WebStore restriction on the Native Client plugin. if (info.name == ASCIIToUTF16(ChromeContentClient::kNaClPluginName)) { bool allow_nacl = cmd->HasSwitch(switches::kEnableNaCl); + // TODO(elijahtaylor) Remove this #if when crbug.com/92964 is fixed. +#if !(defined(OS_LINUX) && ARCH_CPU_32_BITS) if (!allow_nacl) { + const char* kNaClPluginMimeType = "application/x-nacl"; + const char* kNaClPluginManifestAttribute = "nacl"; + GURL nexe_url; if (actual_mime_type == kNaClPluginMimeType) { nexe_url = url; // Normal embedded NaCl plugin. @@ -434,6 +436,7 @@ WebPlugin* ChromeContentRendererClient::CreatePluginImpl( extension->location() == Extension::COMPONENT || extension->location() == Extension::LOAD); } +#endif // !(Linux 32-bit) if (!allow_nacl) { // TODO(bbudge) Webkit will crash if this is a full-frame plug-in and |