summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorasvitkine@chromium.org <asvitkine@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-23 00:31:18 +0000
committerasvitkine@chromium.org <asvitkine@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-23 00:31:18 +0000
commiteb75c21151d3453017d4d1f0aa7ef57d36176bcd (patch)
treef95ebcde940da587c1279e6b64e8019cf8edfc04 /webkit
parent3b4f53fae8668793cae96506e09f45bf6a3a91ce (diff)
downloadchromium_src-eb75c21151d3453017d4d1f0aa7ef57d36176bcd.zip
chromium_src-eb75c21151d3453017d4d1f0aa7ef57d36176bcd.tar.gz
chromium_src-eb75c21151d3453017d4d1f0aa7ef57d36176bcd.tar.bz2
Infobar the Mac DivX Web Player plugin.
BUG=115279 TEST=Open a page containing DivX content. Infobar should be displayed. Review URL: http://codereview.chromium.org/9431031 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@123151 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/plugins/npapi/plugin_list.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/webkit/plugins/npapi/plugin_list.cc b/webkit/plugins/npapi/plugin_list.cc
index 014fe86..3ba49a2 100644
--- a/webkit/plugins/npapi/plugin_list.cc
+++ b/webkit/plugins/npapi/plugin_list.cc
@@ -101,6 +101,9 @@ static const VersionRangeDefinition kJavaVersionRange[] = {
static const VersionRangeDefinition kFlip4MacVersionRange[] = {
{ "", "", "2.2.1", true }
};
+static const VersionRangeDefinition kDivXVersionRange[] = {
+ { "", "", "", true }
+};
// Note: The Adobe Reader browser plug-in is not supported in Chrome.
// Note: The Real Player plugin for mac doesn't expose a version at all.
static const PluginGroupDefinition kGroupDefinitions[] = {
@@ -115,6 +118,9 @@ static const PluginGroupDefinition kGroupDefinitions[] = {
{ "flip4mac", "Flip4Mac", "Flip4Mac", kFlip4MacVersionRange,
arraysize(kFlip4MacVersionRange),
"http://www.telestream.net/flip4mac-wmv/overview.htm" },
+ { "divx-player", "DivX Plus Web Player", "DivX Plus Web Player",
+ kDivXVersionRange, arraysize(kDivXVersionRange),
+ "http://www.divx.com/en/software/divx-plus/web-player" },
kShockwaveDefinition
};