Put some plug-ins behind an infobar, where they have:...

webkit/plugins/npapi/plugin_list.cc

 // Copyright (c) 2010 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 "webkit/plugins/npapi/plugin_list.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
@@ skipping 42 matching lines @@
 static const VersionRangeDefinition kSilverlightVersionRange[] = {
     { "0", "4", "3.0.50106.0" },
     { "4", "5", "" }
 };
 static const VersionRangeDefinition kFlip4MacVersionRange[] = {
     { "", "", "2.2.1" }
 };
 static const VersionRangeDefinition kShockwaveVersionRange[] = {
     { "",  "", "11.5.9.615" }
 };
+// TODO(cevans) - I don't see Adobe Reader in here for Mac.
 static const PluginGroupDefinition kGroupDefinitions[] = {
   kFlashDefinition,
-  { "apple-quicktime", "Quicktime", "QuickTime Plug-in", kQuicktimeVersionRange,
-    arraysize(kQuicktimeVersionRange),
+  { "apple-quicktime", PluginGroup::kQuickTimeGroupName, "QuickTime Plug-in",
+    kQuicktimeVersionRange, arraysize(kQuicktimeVersionRange),
     "http://www.apple.com/quicktime/download/" },
-  { "java-runtime-environment", "Java", "Java", kJavaVersionRange,
-    arraysize(kJavaVersionRange), "http://support.apple.com/kb/HT1338" },
+  { "java-runtime-environment", PluginGroup::kJavaGroupName, "Java",
+    kJavaVersionRange, arraysize(kJavaVersionRange),
+    "http://support.apple.com/kb/HT1338" },
   { "silverlight", "Silverlight", "Silverlight", kSilverlightVersionRange,
     arraysize(kSilverlightVersionRange),
     "http://www.microsoft.com/getsilverlight/" },
   { "flip4mac", "Flip4Mac", "Flip4Mac", kFlip4MacVersionRange,
     arraysize(kFlip4MacVersionRange),
     "http://www.telestream.net/flip4mac-wmv/overview.htm" },
-  { "shockwave", "Shockwave", "Shockwave for Director", kShockwaveVersionRange,
-    arraysize(kShockwaveVersionRange),
+  { "shockwave", PluginGroup::kShockwaveGroupName, "Shockwave for Director",
+    kShockwaveVersionRange, arraysize(kShockwaveVersionRange),
     "http://www.adobe.com/shockwave/download/" }
 };
 
 #elif defined(OS_WIN)
 // TODO(panayiotis): We should group "RealJukebox NS Plugin" with the rest of
 // the RealPlayer files.
 static const VersionRangeDefinition kQuicktimeVersionRange[] = {
     { "", "", "7.6.8" }
 };
 static const VersionRangeDefinition kJavaVersionRange[] = {
     { "0", "7", "6.0.220" }  // "220" is not a typo.
 };
 static const VersionRangeDefinition kAdobeReaderVersionRange[] = {
     { "10", "11", "" },
     { "9", "10", "9.4.1" },
     { "0", "9", "8.2.5" }
 };
 static const VersionRangeDefinition kSilverlightVersionRange[] = {
     { "0", "4", "3.0.50106.0" },
     { "4", "5", "" }
 };
 static const VersionRangeDefinition kShockwaveVersionRange[] = {
     { "", "", "11.5.9.615" }
 };
 static const VersionRangeDefinition kDivXVersionRange[] = {
     { "", "", "1.4.3.4" }
 };
 static const PluginGroupDefinition kGroupDefinitions[] = {
   kFlashDefinition,
-  { "apple-quicktime", "Quicktime", "QuickTime Plug-in", kQuicktimeVersionRange,
-    arraysize(kQuicktimeVersionRange),
+  { "apple-quicktime", PluginGroup::kQuickTimeGroupName, "QuickTime Plug-in",
+    kQuicktimeVersionRange, arraysize(kQuicktimeVersionRange),
     "http://www.apple.com/quicktime/download/" },
-  { "java-runtime-environment", "Java 6", "Java", kJavaVersionRange,
-    arraysize(kJavaVersionRange), "http://www.java.com/" },
+  { "java-runtime-environment", PluginGroup::kJavaGroupName, "Java",
+    kJavaVersionRange, arraysize(kJavaVersionRange), "http://www.java.com/" },
   { "adobe-reader", PluginGroup::kAdobeReaderGroupName, "Adobe Acrobat",
     kAdobeReaderVersionRange, arraysize(kAdobeReaderVersionRange),
     "http://get.adobe.com/reader/" },
   { "silverlight", "Silverlight", "Silverlight", kSilverlightVersionRange,
     arraysize(kSilverlightVersionRange),
     "http://www.microsoft.com/getsilverlight/" },
-  { "shockwave", "Shockwave", "Shockwave for Director", kShockwaveVersionRange,
-    arraysize(kShockwaveVersionRange),
+  { "shockwave", PluginGroup::kShockwaveGroupName, "Shockwave for Director",
+    kShockwaveVersionRange, arraysize(kShockwaveVersionRange),
     "http://www.adobe.com/shockwave/download/" },
   { "divx-player", "DivX Player", "DivX Web Player", kDivXVersionRange,
     arraysize(kDivXVersionRange),
     "http://download.divx.com/divx/autoupdate/player/"
     "DivXWebPlayerInstaller.exe" },
   // These are here for grouping, no vulnerabilities known.
   { "windows-media-player", "Windows Media Player", "Windows Media Player",
     NULL, 0, "" },
   { "microsoft-office", "Microsoft Office", "Microsoft Office",
     NULL, 0, "" },
@@ skipping 11 matching lines @@
 
 static const VersionRangeDefinition kRedhatIcedTeaVersionRange[] = {
     { "0", "1.9", "1.8.3" },
     { "1.9", "1.10", "1.9.2" },
 };
 
 static const PluginGroupDefinition kGroupDefinitions[] = {
   // Flash on Linux is significant because there isn't yet a built-in Flash
   // plug-in on the Linux 64-bit version of Chrome.
   kFlashDefinition,
-  { "java-runtime-environment", "Java 6", "Java", kJavaVersionRange,
-    arraysize(kJavaVersionRange),
+  { "java-runtime-environment", PluginGroup::kJavaGroupName, "Java",
+    kJavaVersionRange, arraysize(kJavaVersionRange),
     "http://www.java.com/en/download/manual.jsp" },
-  { "redhat-icetea-java", "IcedTea", "IcedTea", kRedhatIcedTeaVersionRange,
-    arraysize(kRedhatIcedTeaVersionRange),
+  { "redhat-icetea-java", PluginGroup::kIcedTeaGroupName, "IcedTea",
+    kRedhatIcedTeaVersionRange, arraysize(kRedhatIcedTeaVersionRange),
     "http://www.linuxsecurity.com/content/section/3/170/" },
 };
 #endif
 
 // static
 const PluginGroupDefinition* PluginList::GetPluginGroupDefinitions() {
   return kGroupDefinitions;
 }
 
 // static
@@ skipping 641 matching lines @@
   Shutdown();
 }
 
 void PluginList::Shutdown() {
   STLDeleteContainerPairSecondPointers(plugin_groups_.begin(),
                                        plugin_groups_.end());
 }
 
 }  // namespace npapi
 }  // namespace webkit