Skip to content
Snippets Groups Projects
Commit 545a698d authored by bbudge@google.com's avatar bbudge@google.com
Browse files

Adds the x-nacl to the MIME types recognized by the Pepper NaCl plug-in....

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
parent 39c99eaf
No related branches found
No related tags found
No related merge requests found
......@@ -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);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment