summaryrefslogtreecommitdiffstats
path: root/webkit/plugins
diff options
context:
space:
mode:
authorkerz@chromium.org <kerz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-03 17:50:39 +0000
committerkerz@chromium.org <kerz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-03 17:50:39 +0000
commitd7d78e688fa2c8dd264222ece91cc6b4c9248785 (patch)
tree892b46984e4db29f317980e2ef059c481c45c785 /webkit/plugins
parent592f09e5512d209821639648de35e536b865e023 (diff)
downloadchromium_src-d7d78e688fa2c8dd264222ece91cc6b4c9248785.zip
chromium_src-d7d78e688fa2c8dd264222ece91cc6b4c9248785.tar.gz
chromium_src-d7d78e688fa2c8dd264222ece91cc6b4c9248785.tar.bz2
Revert 83835 - Merge 83822 - Update Flash and Reader metadata.
BUG=81293 Review URL: http://codereview.chromium.org/6909006 TBR=cevans@chromium.org Review URL: http://codereview.chromium.org/6909021 TBR=cevans@chromium.org Review URL: http://codereview.chromium.org/6914020 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@83911 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/plugins')
-rw-r--r--webkit/plugins/npapi/plugin_list.cc14
1 files changed, 2 insertions, 12 deletions
diff --git a/webkit/plugins/npapi/plugin_list.cc b/webkit/plugins/npapi/plugin_list.cc
index ebb503a..1195612 100644
--- a/webkit/plugins/npapi/plugin_list.cc
+++ b/webkit/plugins/npapi/plugin_list.cc
@@ -28,17 +28,9 @@ FilePath::CharType kDefaultPluginLibraryName[] =
// Some version ranges can be shared across operating systems. This should be
// done where possible to avoid duplication.
-// This is uptodate with
-// http://www.adobe.com/support/security/bulletins/apsb11-07.html
static const VersionRangeDefinition kFlashVersionRange[] = {
- // Chrome Flash is .154 and always uptodate due to being built-in.
- { "0", "10.2.155", "10.2.154", false },
- // External Flash (Linux x86_64) needs .159, and never had a .154 series
- // release (which is why this split-range works nicely and simply).
- { "10.2.155", "10.3", "10.2.159", false }
+ { "", "", "10.2.153", false }
};
-// This is uptodate with
-// http://www.adobe.com/support/security/bulletins/apsb11-01.html
static const VersionRangeDefinition kShockwaveVersionRange[] = {
{ "", "", "11.5.9.620", true }
};
@@ -103,11 +95,9 @@ static const VersionRangeDefinition kQuicktimeVersionRange[] = {
static const VersionRangeDefinition kJavaVersionRange[] = {
{ "0", "7", "6.0.240", true } // "240" is not a typo.
};
-// This is uptodate with
-// http://www.adobe.com/support/security/bulletins/apsb11-08.html
static const VersionRangeDefinition kAdobeReaderVersionRange[] = {
{ "10", "11", "10.0.1", false },
- { "9", "10", "9.4.4", false },
+ { "9", "10", "9.4.3", false },
{ "0", "9", "8.2.6", false }
};
static const VersionRangeDefinition kDivXVersionRange[] = {