summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-03 15:54:47 +0000
committerbauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-03 15:54:47 +0000
commitc513c973cc0dec3012d5b7efa9817bf85fdcc7e6 (patch)
tree38549ecd6a4456c2dd3565c4f336a580ec63b8e2
parent6e1f1f9b23a0b5154d5856167bec2fa0ed61ff4c (diff)
downloadchromium_src-c513c973cc0dec3012d5b7efa9817bf85fdcc7e6.zip
chromium_src-c513c973cc0dec3012d5b7efa9817bf85fdcc7e6.tar.gz
chromium_src-c513c973cc0dec3012d5b7efa9817bf85fdcc7e6.tar.bz2
Update required Flash version to 10.3.183.10.
See http://www.adobe.com/support/security/bulletins/apsb11-26.html. BUG=81293 TEST=Flash Player 10.3.183.7 is considered out of date. Review URL: http://codereview.chromium.org/9071005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116138 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--webkit/plugins/npapi/plugin_list.cc17
1 files changed, 12 insertions, 5 deletions
diff --git a/webkit/plugins/npapi/plugin_list.cc b/webkit/plugins/npapi/plugin_list.cc
index f12ce5c..5a0479c 100644
--- a/webkit/plugins/npapi/plugin_list.cc
+++ b/webkit/plugins/npapi/plugin_list.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -59,9 +59,16 @@ 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
+// http://www.adobe.com/support/security/bulletins/apsb11-28.html
static const VersionRangeDefinition kFlashVersionRange[] = {
- { "", "", "10.3.183", false }
+// Flash on Linux doesn't show the fourth version component, so we leave it
+// out here in order to avoid blocking an up-to-date Flash.
+#if defined(OS_LINUX)
+#define FLASH_SUBVERSION ""
+#else
+#define FLASH_SUBVERSION ".55"
+#endif
+ { "", "", "11.1.102" FLASH_SUBVERSION, false }
};
// This is up to date with
// http://www.adobe.com/support/security/bulletins/apsb11-19.html
@@ -132,10 +139,10 @@ 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-24.html
+// http://www.adobe.com/support/security/bulletins/apsb11-30.html
static const VersionRangeDefinition kAdobeReaderVersionRange[] = {
{ "10", "11", "10.1.1", false },
- { "9", "10", "9.4.6", false },
+ { "9", "10", "9.4.7", false },
{ "0", "9", "8.3.1", false }
};
static const VersionRangeDefinition kDivXVersionRange[] = {