summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorcevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-29 20:44:48 +0000
committercevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-29 20:44:48 +0000
commit38b439a805c04d1edc2a07c2db7c4b3799339e47 (patch)
tree6157cd248990dbb182324ace6370bbe6375bd158 /webkit
parent3f79148c29174d4891dee2c6ee22b01675ac3248 (diff)
downloadchromium_src-38b439a805c04d1edc2a07c2db7c4b3799339e47.zip
chromium_src-38b439a805c04d1edc2a07c2db7c4b3799339e47.tar.gz
chromium_src-38b439a805c04d1edc2a07c2db7c4b3799339e47.tar.bz2
Report more detailed stats on which plug-ins are being blocked.
BUG=77810 Review URL: http://codereview.chromium.org/6708098 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79740 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/plugins/npapi/plugin_group.cc2
-rw-r--r--webkit/plugins/npapi/plugin_group.h2
-rw-r--r--webkit/plugins/npapi/plugin_list.cc6
3 files changed, 7 insertions, 3 deletions
diff --git a/webkit/plugins/npapi/plugin_group.cc b/webkit/plugins/npapi/plugin_group.cc
index c487d24..b86a7bb 100644
--- a/webkit/plugins/npapi/plugin_group.cc
+++ b/webkit/plugins/npapi/plugin_group.cc
@@ -23,6 +23,8 @@ const char* PluginGroup::kAdobeReaderUpdateURL = "http://get.adobe.com/reader/";
const char* PluginGroup::kJavaGroupName = "Java";
const char* PluginGroup::kQuickTimeGroupName = "QuickTime";
const char* PluginGroup::kShockwaveGroupName = "Shockwave";
+const char* PluginGroup::kRealPlayerGroupName = "RealPlayer";
+const char* PluginGroup::kSilverlightGroupName = "Silverlight";
/*static*/
std::set<string16>* PluginGroup::policy_disabled_plugin_patterns_;
diff --git a/webkit/plugins/npapi/plugin_group.h b/webkit/plugins/npapi/plugin_group.h
index 122ba89..7a3bf04 100644
--- a/webkit/plugins/npapi/plugin_group.h
+++ b/webkit/plugins/npapi/plugin_group.h
@@ -87,6 +87,8 @@ class PluginGroup {
static const char* kJavaGroupName;
static const char* kQuickTimeGroupName;
static const char* kShockwaveGroupName;
+ static const char* kRealPlayerGroupName;
+ static const char* kSilverlightGroupName;
PluginGroup(const PluginGroup& other);
diff --git a/webkit/plugins/npapi/plugin_list.cc b/webkit/plugins/npapi/plugin_list.cc
index 7115dd6..933b13a 100644
--- a/webkit/plugins/npapi/plugin_list.cc
+++ b/webkit/plugins/npapi/plugin_list.cc
@@ -117,15 +117,15 @@ static const PluginGroupDefinition kGroupDefinitions[] = {
{ "adobe-reader", PluginGroup::kAdobeReaderGroupName, "Adobe Acrobat",
kAdobeReaderVersionRange, arraysize(kAdobeReaderVersionRange),
"http://get.adobe.com/reader/" },
- { "silverlight", "Silverlight", "Silverlight", kSilverlightVersionRange,
- arraysize(kSilverlightVersionRange),
+ { "silverlight", PluginGroup::kSilverlightGroupName, "Silverlight",
+ kSilverlightVersionRange, arraysize(kSilverlightVersionRange),
"http://www.microsoft.com/getsilverlight/" },
kShockwaveDefinition,
{ "divx-player", "DivX Player", "DivX Web Player", kDivXVersionRange,
arraysize(kDivXVersionRange),
"http://download.divx.com/divx/autoupdate/player/"
"DivXWebPlayerInstaller.exe" },
- { "realplayer", "RealPlayer", "RealPlayer",
+ { "realplayer", PluginGroup::kRealPlayerGroupName, "RealPlayer",
kRealPlayerVersionRange, arraysize(kRealPlayerVersionRange),
"http://www.real.com/realplayer/downloads" },
// These are here for grouping, no vulnerabilities known.