diff options
| author | bradchen@google.com <bradchen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-02 04:24:37 +0000 |
|---|---|---|
| committer | bradchen@google.com <bradchen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-02 04:24:37 +0000 |
| commit | d2c513cedd908259fa3a9c9d0aac79d4edffae99 (patch) | |
| tree | 691094fff2daf1bedf5c27cc16985af6ef423470 /chrome/renderer/chrome_content_renderer_client.cc | |
| parent | a5ff559cf1182c4e86293784a64a52574eada1b4 (diff) | |
| download | chromium_src-d2c513cedd908259fa3a9c9d0aac79d4edffae99.zip chromium_src-d2c513cedd908259fa3a9c9d0aac79d4edffae99.tar.gz chromium_src-d2c513cedd908259fa3a9c9d0aac79d4edffae99.tar.bz2 | |
Enable nacl_helper by default.
BUG=92964,nativeclient:480
TEST=nacl_integration in chromium bots
Review URL: http://codereview.chromium.org/7821021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99319 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/chrome_content_renderer_client.cc')
| -rw-r--r-- | chrome/renderer/chrome_content_renderer_client.cc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc index 921c14d..858d5ad 100644 --- a/chrome/renderer/chrome_content_renderer_client.cc +++ b/chrome/renderer/chrome_content_renderer_client.cc @@ -406,8 +406,6 @@ 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"; @@ -445,7 +443,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 |