Make WebPluginInfo more generic

chrome/common/chrome_content_client.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/chrome_content_client.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
@@ skipping 67 matching lines @@
   // but (on Linux) this function is always called once before we're sandboxed.
   // So the first time through test if the file is available and then skip the
   // check on subsequent calls if yes.
   static bool skip_pdf_file_check = false;
   FilePath path;
   if (PathService::Get(chrome::FILE_PDF_PLUGIN, &path)) {
     if (skip_pdf_file_check || file_util::PathExists(path)) {
       PepperPluginInfo pdf;
       pdf.path = path;
       pdf.name = kPDFPluginName;
-      webkit::npapi::WebPluginMimeType pdf_mime_type(kPDFPluginMimeType,
-                                                     kPDFPluginExtension,
-                                                     kPDFPluginDescription);
-      webkit::npapi::WebPluginMimeType print_preview_pdf_mime_type(
+      webkit::WebPluginMimeType pdf_mime_type(kPDFPluginMimeType,
+                                              kPDFPluginExtension,
+                                              kPDFPluginDescription);
+      webkit::WebPluginMimeType print_preview_pdf_mime_type(
           kPDFPluginPrintPreviewMimeType,
           kPDFPluginExtension,
           kPDFPluginDescription);
       pdf.mime_types.push_back(pdf_mime_type);
       pdf.mime_types.push_back(print_preview_pdf_mime_type);
       plugins->push_back(pdf);
 
       skip_pdf_file_check = true;
     }
   }
 
   // Handle the Native Client just like the PDF plugin. This means that it is
   // enabled by default. This allows apps installed from the Chrome Web Store
   // to use NaCl even if the command line switch isn't set. For other uses of
   // NaCl we check for the command line switch.
   static bool skip_nacl_file_check = false;
   if (PathService::Get(chrome::FILE_NACL_PLUGIN, &path)) {
     if (skip_nacl_file_check || file_util::PathExists(path)) {
       PepperPluginInfo nacl;
       nacl.path = path;
       nacl.name = kNaClPluginName;
-      webkit::npapi::WebPluginMimeType nacl_mime_type(kNaClPluginMimeType,
-                                                      kNaClPluginExtension,
-                                                      kNaClPluginDescription);
+      webkit::WebPluginMimeType nacl_mime_type(kNaClPluginMimeType,
+                                               kNaClPluginExtension,
+                                               kNaClPluginDescription);
       nacl.mime_types.push_back(nacl_mime_type);
       plugins->push_back(nacl);
 
       skip_nacl_file_check = true;
     }
   }
 
   // The Remoting Viewer plugin is built-in.
 #if defined(ENABLE_REMOTING)
   PepperPluginInfo info;
   info.is_internal = true;
   info.name = kRemotingViewerPluginName;
   info.path = FilePath(kRemotingViewerPluginPath);
-  webkit::npapi::WebPluginMimeType remoting_mime_type(
+  webkit::WebPluginMimeType remoting_mime_type(
       kRemotingViewerPluginMimeType,
       std::string(),
       std::string());
   info.mime_types.push_back(remoting_mime_type);
-  webkit::npapi::WebPluginMimeType old_remoting_mime_type(
+  webkit::WebPluginMimeType old_remoting_mime_type(
       kRemotingViewerPluginOldMimeType,
       std::string(),
       std::string());
   info.mime_types.push_back(old_remoting_mime_type);
   info.internal_entry_points.get_interface = remoting::PPP_GetInterface;
   info.internal_entry_points.initialize_module =
       remoting::PPP_InitializeModule;
   info.internal_entry_points.shutdown_module = remoting::PPP_ShutdownModule;
 
   plugins->push_back(info);
@@ skipping 31 matching lines @@
   if (flash_version_numbers.size() < 2)
     flash_version_numbers.push_back("2");
   if (flash_version_numbers.size() < 3)
     flash_version_numbers.push_back("999");
   if (flash_version_numbers.size() < 4)
     flash_version_numbers.push_back("999");
   // E.g., "Shockwave Flash 10.2 r154":
   plugin.description = plugin.name + " " + flash_version_numbers[0] + "." +
       flash_version_numbers[1] + " r" + flash_version_numbers[2];
   plugin.version = JoinString(flash_version_numbers, '.');
-  webkit::npapi::WebPluginMimeType swf_mime_type(kFlashPluginSwfMimeType,
-                                                 kFlashPluginSwfExtension,
-                                                 kFlashPluginSwfDescription);
+  webkit::WebPluginMimeType swf_mime_type(kFlashPluginSwfMimeType,
+                                          kFlashPluginSwfExtension,
+                                          kFlashPluginSwfDescription);
   plugin.mime_types.push_back(swf_mime_type);
-  webkit::npapi::WebPluginMimeType spl_mime_type(kFlashPluginSplMimeType,
-                                                 kFlashPluginSplExtension,
-                                                 kFlashPluginSplDescription);
+  webkit::WebPluginMimeType spl_mime_type(kFlashPluginSplMimeType,
+                                          kFlashPluginSplExtension,
+                                          kFlashPluginSplDescription);
   plugin.mime_types.push_back(spl_mime_type);
   plugins->push_back(plugin);
 }
 
 #endif  // !defined(NACL_WIN64)
 
 #if defined(OS_WIN)
 // Launches the privileged flash broker, used when flash is sandboxed.
 // The broker is the same flash dll, except that it uses a different
 // entrypoint (BrokerMain) and it is hosted in windows' generic surrogate
@@ skipping 61 matching lines @@
 void ChromeContentClient::SetActiveURL(const GURL& url) {
   child_process_logging::SetActiveURL(url);
 }
 
 void ChromeContentClient::SetGpuInfo(const GPUInfo& gpu_info) {
   child_process_logging::SetGpuInfo(gpu_info);
 }
 
 void ChromeContentClient::AddPepperPlugins(
     std::vector<PepperPluginInfo>* plugins) {
+      ::OutputDebugStringA("ChromeContentClient::AddPepperPlugins");

[Nico, 2011/08/14 02:46:06]

remove

 #if !defined(NACL_WIN64)  // The code this needs isn't linked on Win64 builds.
   ComputeBuiltInPlugins(plugins);
   AddOutOfProcessFlash(plugins);
 #endif
 }
 
 bool ChromeContentClient::CanSendWhileSwappedOut(const IPC::Message* msg) {
   // Any Chrome-specific messages that must be allowed to be sent from swapped
   // out renderers.
   switch (msg->type()) {
@@ skipping 98 matching lines @@
     policy->SetJobLevel(sandbox::JOB_UNPROTECTED, 0);
     policy->SetTokenLevel(
         sandbox::USER_UNPROTECTED, sandbox::USER_UNPROTECTED);
   }
 
   return true;
 }
 #endif
 
 }  // namespace chrome