Add plugin type (NPAPI, PPAPI, etc.) to chrome://plugins.

chrome/browser/ui/webui/plugins_ui.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/browser/ui/webui/plugins_ui.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 18 matching lines @@
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/plugin_service.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/notification_service.h"
 #include "grit/browser_resources.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/theme_resources_standard.h"
+#include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "webkit/plugins/npapi/plugin_group.h"
 
 using webkit::npapi::PluginGroup;
 using webkit::WebPluginInfo;
 
 namespace {
 
 ChromeWebUIDataSource* CreatePluginsUIHTMLSource() {
   ChromeWebUIDataSource* source =
       new ChromeWebUIDataSource(chrome::kChromeUIPluginsHost);
 
   source->AddLocalizedString("pluginsTitle", IDS_PLUGINS_TITLE);
   source->AddLocalizedString("pluginsDetailsModeLink",
                              IDS_PLUGINS_DETAILS_MODE_LINK);
   source->AddLocalizedString("pluginsNoneInstalled",
                              IDS_PLUGINS_NONE_INSTALLED);
   source->AddLocalizedString("pluginDisabled", IDS_PLUGINS_DISABLED_PLUGIN);
   source->AddLocalizedString("pluginDisabledByPolicy",
                              IDS_PLUGINS_DISABLED_BY_POLICY_PLUGIN);
   source->AddLocalizedString("pluginEnabledByPolicy",
                              IDS_PLUGINS_ENABLED_BY_POLICY_PLUGIN);
   source->AddLocalizedString("pluginDownload", IDS_PLUGINS_DOWNLOAD);
   source->AddLocalizedString("pluginName", IDS_PLUGINS_NAME);
   source->AddLocalizedString("pluginVersion", IDS_PLUGINS_VERSION);
   source->AddLocalizedString("pluginDescription", IDS_PLUGINS_DESCRIPTION);
   source->AddLocalizedString("pluginPath", IDS_PLUGINS_PATH);
+  source->AddLocalizedString("pluginType", IDS_PLUGINS_TYPE);
   source->AddLocalizedString("pluginMimeTypes", IDS_PLUGINS_MIME_TYPES);
   source->AddLocalizedString("pluginMimeTypesMimeType",
                              IDS_PLUGINS_MIME_TYPES_MIME_TYPE);
   source->AddLocalizedString("pluginMimeTypesDescription",
                              IDS_PLUGINS_MIME_TYPES_DESCRIPTION);
   source->AddLocalizedString("pluginMimeTypesFileExtensions",
                              IDS_PLUGINS_MIME_TYPES_FILE_EXTENSIONS);
   source->AddLocalizedString("disable", IDS_PLUGINS_DISABLE);
   source->AddLocalizedString("enable", IDS_PLUGINS_ENABLE);
   source->AddLocalizedString("noPlugins", IDS_PLUGINS_NO_PLUGINS);
 
   source->set_json_path("strings.js");
   source->add_resource_path("plugins.js", IDR_PLUGINS_JS);
   source->set_default_resource(IDR_PLUGINS_HTML);
   return source;
 }
 
+string16 PluginTypeToString(int type) {
+  // The type is stored as an |int|, but doing the switch on the right
+  // enumeration type gives us better build-time error checking (if someone adds
+  // a new type).
+  switch (static_cast<WebPluginInfo::PluginType>(type)) {
+    case WebPluginInfo::PLUGIN_TYPE_NPAPI:
+      return l10n_util::GetStringUTF16(IDS_PLUGINS_NPAPI);
+    case WebPluginInfo::PLUGIN_TYPE_PEPPER_IN_PROCESS:
+      return l10n_util::GetStringUTF16(IDS_PLUGINS_PPAPI_IN_PROCESS);
+    case WebPluginInfo::PLUGIN_TYPE_PEPPER_OUT_OF_PROCESS:
+      return l10n_util::GetStringUTF16(IDS_PLUGINS_PPAPI_OUT_OF_PROCESS);
+  }
+  NOTREACHED();
+  return string16();
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 //
 // PluginsDOMHandler
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 // The handler for Javascript messages for the chrome://plugins/ page.
 // TODO(viettrungluu): Make plugin list updates notify, and then observe
 // changes; maybe replumb plugin list through plugin service?
 // <http://crbug.com/39101>
@@ skipping 164 matching lines @@
     bool all_plugins_disabled_by_policy = true;
     const WebPluginInfo* active_plugin = NULL;
     for (size_t j = 0; j < group.web_plugin_infos().size(); ++j) {
       const WebPluginInfo& group_plugin = group.web_plugin_infos()[j];
 
       DictionaryValue* plugin_file = new DictionaryValue();
       plugin_file->SetString("name", group_plugin.name);
       plugin_file->SetString("description", group_plugin.desc);
       plugin_file->SetString("path", group_plugin.path.value());
       plugin_file->SetString("version", group_plugin.version);
+      plugin_file->SetString("type", PluginTypeToString(group_plugin.type));
 
       ListValue* mime_types = new ListValue();
       const std::vector<webkit::WebPluginMimeType>& plugin_mime_types =
           group_plugin.mime_types;
       for (size_t k = 0; k < plugin_mime_types.size(); ++k) {
         DictionaryValue* mime_type = new DictionaryValue();
         mime_type->SetString("mimeType", plugin_mime_types[k].mime_type);
         mime_type->SetString("description", plugin_mime_types[k].description);
 
         ListValue* file_extensions = new ListValue();
@@ skipping 93 matching lines @@
 
 // static
 void PluginsUI::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterBooleanPref(prefs::kPluginsShowDetails,
                              false,
                              PrefService::UNSYNCABLE_PREF);
   prefs->RegisterBooleanPref(prefs::kPluginsShowSetReaderDefaultInfobar,
                              true,
                              PrefService::UNSYNCABLE_PREF);
 }