diff options
| author | elijahtaylor@google.com <elijahtaylor@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-19 07:29:27 +0000 |
|---|---|---|
| committer | elijahtaylor@google.com <elijahtaylor@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-19 07:29:27 +0000 |
| commit | 92298bc72a20d927aaf18f7c79c983fbf4d8672a (patch) | |
| tree | 3eac19db4d5839d6b528e05ed68d953c6826ad79 /chrome/renderer | |
| parent | 36568926d6b8f29d7b3092969850fe40c2e2661f (diff) | |
| download | chromium_src-92298bc72a20d927aaf18f7c79c983fbf4d8672a.zip chromium_src-92298bc72a20d927aaf18f7c79c983fbf4d8672a.tar.gz chromium_src-92298bc72a20d927aaf18f7c79c983fbf4d8672a.tar.bz2 | |
Disable NaCl on 32-bit linux, also disable NaCl extension/store tests for that platform.
BUG=93165
TEST=manual
re-roll of http://codereview.chromium.org/7670055/, was reverted because tests weren't disabled.
Review URL: http://codereview.chromium.org/7621068
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97440 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
| -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 25ae18d..c18df0d 100644 --- a/chrome/renderer/chrome_content_renderer_client.cc +++ b/chrome/renderer/chrome_content_renderer_client.cc @@ -101,9 +101,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"; @@ -403,7 +400,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. @@ -437,6 +439,7 @@ WebPlugin* ChromeContentRendererClient::CreatePluginImpl( extension->location() == Extension::COMPONENT || extension->location() == Extension::LOAD); } +#endif // !(defined(OS_LINUX) && ARCH_CPU_32_BITS) if (!allow_nacl) { // TODO(bbudge) Webkit will crash if this is a full-frame plug-in and |