Chromium Code Reviews| Index: chrome/renderer/chrome_content_renderer_client.cc |
| diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc |
| index 921c14d2f77a5cc5ee7a8a0b20c7e91beb8ee7a9..b9a23d099f5ee7ccfc6bcd35812bb1d2fb3faa25 100644 |
| --- a/chrome/renderer/chrome_content_renderer_client.cc |
| +++ b/chrome/renderer/chrome_content_renderer_client.cc |
| @@ -407,7 +407,6 @@ WebPlugin* ChromeContentRendererClient::CreatePluginImpl( |
| if (info.name == ASCIIToUTF16(ChromeContentClient::kNaClPluginName)) { |
| bool allow_nacl = cmd->HasSwitch(switches::kEnableNaCl); |
| // TODO(elijahtaylor) Remove this #if when crbug.com/92964 is fixed. |
|
elijahtaylor (use chromium)
2011/09/01 19:49:53
please remove TODO
|
| -#if !(defined(OS_LINUX) && ARCH_CPU_32_BITS) |
| if (!allow_nacl) { |
| const char* kNaClPluginMimeType = "application/x-nacl"; |
| const char* kNaClPluginManifestAttribute = "nacl"; |
| @@ -445,7 +444,6 @@ 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 |