Don't infobar pdf viewer and google talk plugin.

TBR=jam@chromium.org

BUG=115472
TEST=what it says


Review URL: http://codereview.chromium.org/9537005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124178 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 15 insertions, 7 deletions

diff --git a/webkit/plugins/npapi/plugin_list.cc b/webkit/plugins/npapi/plugin_list.cc
index 5d46b20..83800f6 100644
--- a/webkit/plugins/npapi/plugin_list.cc
+++ b/webkit/plugins/npapi/plugin_list.cc
@@ -55,10 +55,16 @@ namespace npapi {
 
 // Some version ranges can be shared across operating systems. This should be
 // done where possible to avoid duplication.
-static const VersionRangeDefinition kAllVersionsVersionRange[] = {
+// TODO(bauerb): The |requires_authorization| flag should be part of
+// PluginGroupDefinition, not VersionRangeDefinition.
+static const VersionRangeDefinition kAllVersionsInfobarVersionRange[] = {
     { "", "", "", true }
 };
 
+static const VersionRangeDefinition kAllVersionsNoInfobarVersionRange[] = {
+    { "", "", "", false }
+};
+
 // This is up to date with
 // http://www.adobe.com/support/security/bulletins/apsb12-03.html
 // NOTE: We would like to go to the 4th component value but we cannot because
@@ -97,11 +103,13 @@ static const VersionRangeDefinition kSilverlightVersionRange[] = {
 
 #define kChromePdfDefinition { \
     "google-chrome-pdf", "Chrome PDF Viewer", "Chrome PDF Viewer", \
-    kAllVersionsVersionRange, arraysize(kAllVersionsVersionRange), "" }
+    kAllVersionsNoInfobarVersionRange, \
+    arraysize(kAllVersionsNoInfobarVersionRange), "" }
 
 #define kGoogleTalkDefinition { \
     "google-talk", "Google Talk NPAPI Plugin", "Google Talk NPAPI Plugin", \
-    kAllVersionsVersionRange, arraysize(kAllVersionsVersionRange), ""}
+    kAllVersionsNoInfobarVersionRange, \
+    arraysize(kAllVersionsNoInfobarVersionRange), ""}
 
 #if defined(OS_MACOSX)
 // Plugin Groups for Mac.
@@ -189,12 +197,12 @@ static const PluginGroupDefinition kGroupDefinitions[] = {
     "http://www.real.com/realplayer/download" },
   // These are here for grouping, no vulnerabilities known.
   { "windows-media-player", PluginGroup::kWindowsMediaPlayerGroupName,
-    "Windows Media Player", kAllVersionsVersionRange,
-    arraysize(kAllVersionsVersionRange), "" },
+    "Windows Media Player", kAllVersionsInfobarVersionRange,
+    arraysize(kAllVersionsInfobarVersionRange), "" },
   { "microsoft-office", "Microsoft Office", "Microsoft Office",
     NULL, 0, "" },
-  { "nvidia-3d", "NVIDIA 3D", "NVIDIA 3D", kAllVersionsVersionRange,
-    arraysize(kAllVersionsVersionRange), "" },
+  { "nvidia-3d", "NVIDIA 3D", "NVIDIA 3D", kAllVersionsInfobarVersionRange,
+    arraysize(kAllVersionsInfobarVersionRange), "" },
   kChromePdfDefinition,
   kGoogleTalkDefinition,
 };