Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8733)

Unified Diff: chrome/renderer/chrome_content_renderer_client.cc

Issue 7670055: Disable NaCl on 32-bit linux (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/chrome_content_renderer_client.cc
===================================================================
--- chrome/renderer/chrome_content_renderer_client.cc (revision 97182)
+++ chrome/renderer/chrome_content_renderer_client.cc (working copy)
@@ -98,9 +98,6 @@
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 @@
// 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";
jam 2011/08/18 00:17:59 why move these?
elijahtaylor (use chromium) 2011/08/18 00:21:03 Their only references come from this if block so o
+ const char* kNaClPluginManifestAttribute = "nacl";
+
GURL nexe_url;
if (actual_mime_type == kNaClPluginMimeType) {
nexe_url = url; // Normal embedded NaCl plugin.
@@ -433,6 +435,7 @@
(extension->from_webstore() ||
extension->location() == Extension::COMPONENT);
}
+#endif // !(Linux 32-bit)
if (!allow_nacl) {
// TODO(bbudge) Webkit will crash if this is a full-frame plug-in and
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698