From 545a698d90b9e42589bfde4bdf1924b43bdc7353 Mon Sep 17 00:00:00 2001
From: "bbudge@google.com"
<bbudge@google.com@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Tue, 11 Jan 2011 22:02:30 +0000
Subject: [PATCH] Adds the x-nacl to the MIME types recognized by the Pepper
NaCl plug-in. Another CL will remove the old MIME type (x-ppapi-nacl-srpc)
after the NaCl tree has been updated, to avoid a window where NaCl is broken.
BUG=none TESTS=manual Review URL: http://codereview.chromium.org/6117005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71094 0039d316-1c4b-4281-b951-d872f2087c98
---
chrome/common/pepper_plugin_registry.cc | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/chrome/common/pepper_plugin_registry.cc b/chrome/common/pepper_plugin_registry.cc
index 343a646e27dd3..053d897235dba 100644
--- a/chrome/common/pepper_plugin_registry.cc
+++ b/chrome/common/pepper_plugin_registry.cc
@@ -23,7 +23,7 @@ const char* PepperPluginRegistry::kPDFPluginDescription =
const char* PepperPluginRegistry::kNaClPluginName = "Chrome NaCl";
const char* PepperPluginRegistry::kNaClPluginMimeType =
- "application/x-ppapi-nacl-srpc";
+ "application/x-nacl";
const char* PepperPluginRegistry::kNaClPluginExtension = "nexe";
const char* PepperPluginRegistry::kNaClPluginDescription =
"Native Client Executable";
@@ -162,6 +162,12 @@ void PepperPluginRegistry::GetExtraPlugins(
nacl.path = path;
nacl.name = kNaClPluginName;
nacl.mime_types.push_back(kNaClPluginMimeType);
+
+ // TODO(bbudge) Remove this mime type after NaCl tree has been updated.
+ const char* kNaClPluginOldMimeType =
+ "application/x-ppapi-nacl-srpc";
+ nacl.mime_types.push_back(kNaClPluginOldMimeType);
+
nacl.file_extensions = kNaClPluginExtension;
nacl.type_descriptions = kNaClPluginDescription;
plugins->push_back(nacl);
--
GitLab