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

chrome/common/pepper_plugin_registry.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/common/pepper_plugin_registry.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/native_library.h"
 #include "base/path_service.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "remoting/client/plugin/pepper_entrypoints.h"
 
 const char* PepperPluginRegistry::kPDFPluginName = "Chrome PDF Viewer";
 const char* PepperPluginRegistry::kPDFPluginMimeType = "application/pdf";
 const char* PepperPluginRegistry::kPDFPluginExtension = "pdf";
 const char* PepperPluginRegistry::kPDFPluginDescription =
     "Portable Document Format";
 
 const char* PepperPluginRegistry::kNaClPluginName = "Chrome NaCl";
 const char* PepperPluginRegistry::kNaClPluginMimeType =
-    "application/x-ppapi-nacl-srpc";
+    "application/x-nacl";

[abarth-chromium, 2011/01/11 01:01:13]

Much nicer!

 const char* PepperPluginRegistry::kNaClPluginExtension = "nexe";
 const char* PepperPluginRegistry::kNaClPluginDescription =
     "Native Client Executable";
 
 
 PepperPluginInfo::PepperPluginInfo()
     : is_internal(false),
       is_out_of_process(false) {
 }
 
@@ skipping 118 matching lines @@
       CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableNaCl) ||
       CommandLine::ForCurrentProcess()->HasSwitch(switches::kInternalNaCl);
 
   static bool skip_nacl_file_check = false;
   if (enable_nacl && PathService::Get(chrome::FILE_NACL_PLUGIN, &path)) {
     if (skip_nacl_file_check || file_util::PathExists(path)) {
       PepperPluginInfo nacl;
       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);
 
       skip_nacl_file_check = true;
     }
   }
 }
 
 PepperPluginRegistry::InternalPluginInfo::InternalPluginInfo() {
@@ skipping 117 matching lines @@
         new webkit::ppapi::PluginModule(this));
     if (!module->InitAsLibrary(path)) {
       DLOG(ERROR) << "Failed to load pepper module: " << path.value();
       continue;
     }
     module->set_name(plugins[i].name);
     preloaded_modules_[path] = module;
     AddLiveModule(path, module);
   }
 }