summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-02 01:28:57 +0000
committercevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-02 01:28:57 +0000
commit647d5e43e72b8e7c9dabfb012d81826d2db3e997 (patch)
treed01423bca5c0e2133b8115b8344aa343c9b870b0
parent95e2cd29041aad6b60ef97e291d7a240ca5c1f60 (diff)
downloadchromium_src-647d5e43e72b8e7c9dabfb012d81826d2db3e997.zip
chromium_src-647d5e43e72b8e7c9dabfb012d81826d2db3e997.tar.gz
chromium_src-647d5e43e72b8e7c9dabfb012d81826d2db3e997.tar.bz2
Merge 108158 - Update version metadata for Flash, Reader, Shockwave.
BUG=81293 Review URL: http://codereview.chromium.org/8440010 TBR=cevans@chromium.org Review URL: http://codereview.chromium.org/8423032 git-svn-id: svn://svn.chromium.org/chrome/branches/912/src@108225 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--webkit/plugins/npapi/plugin_list.cc16
1 files changed, 10 insertions, 6 deletions
diff --git a/webkit/plugins/npapi/plugin_list.cc b/webkit/plugins/npapi/plugin_list.cc
index 85a1bca..8b7091f 100644
--- a/webkit/plugins/npapi/plugin_list.cc
+++ b/webkit/plugins/npapi/plugin_list.cc
@@ -28,11 +28,15 @@ FilePath::CharType kDefaultPluginLibraryName[] =
// Some version ranges can be shared across operating systems. This should be
// done where possible to avoid duplication.
+// This is up to date with
+// http://www.adobe.com/support/security/bulletins/apsb11-26.html
static const VersionRangeDefinition kFlashVersionRange[] = {
- { "", "", "10.2.153", false }
+ { "", "", "10.3.183", false }
};
+// This is up to date with
+// http://www.adobe.com/support/security/bulletins/apsb11-19.html
static const VersionRangeDefinition kShockwaveVersionRange[] = {
- { "", "", "11.5.9.620", true }
+ { "", "", "11.6.1.629", true }
};
static const VersionRangeDefinition kSilverlightVersionRange[] = {
{ "0", "4", "3.0.50611.0", false },
@@ -98,11 +102,11 @@ static const VersionRangeDefinition kJavaVersionRange[] = {
{ "7", "", "10.1", true } // JDK7u1 identifies itself as 10.1
};
// This is up to date with
-// http://www.adobe.com/support/security/bulletins/apsb11-08.html
+// http://www.adobe.com/support/security/bulletins/apsb11-24.html
static const VersionRangeDefinition kAdobeReaderVersionRange[] = {
- { "10", "11", "10.0.1", false },
- { "9", "10", "9.4.4", false },
- { "0", "9", "8.2.6", false }
+ { "10", "11", "10.1.1", false },
+ { "9", "10", "9.4.6", false },
+ { "0", "9", "8.3.1", false }
};
static const VersionRangeDefinition kDivXVersionRange[] = {
{ "", "", "1.4.3.4", false }