diff options
| author | cevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-02 01:14:57 +0000 |
|---|---|---|
| committer | cevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-02 01:14:57 +0000 |
| commit | 95e2cd29041aad6b60ef97e291d7a240ca5c1f60 (patch) | |
| tree | 44283a7872d006aaa9862b54e797bb4d03bb783a | |
| parent | 5cb42074da50f7795c82c384cd73095b2e6ae993 (diff) | |
| download | chromium_src-95e2cd29041aad6b60ef97e291d7a240ca5c1f60.zip chromium_src-95e2cd29041aad6b60ef97e291d7a240ca5c1f60.tar.gz chromium_src-95e2cd29041aad6b60ef97e291d7a240ca5c1f60.tar.bz2 | |
Merge 108143 - Update JRE version metadata.
BUG=102461
Review URL: http://codereview.chromium.org/8428011
TBR=cevans@chromium.org
Review URL: http://codereview.chromium.org/8439027
git-svn-id: svn://svn.chromium.org/chrome/branches/912/src@108223 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | webkit/plugins/npapi/plugin_list.cc | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/webkit/plugins/npapi/plugin_list.cc b/webkit/plugins/npapi/plugin_list.cc index 9bad351..85a1bca 100644 --- a/webkit/plugins/npapi/plugin_list.cc +++ b/webkit/plugins/npapi/plugin_list.cc @@ -64,7 +64,8 @@ static const VersionRangeDefinition kQuicktimeVersionRange[] = { }; static const VersionRangeDefinition kJavaVersionRange[] = { { "0", "13.0", "12.8.0", true }, // Leopard - { "13.0", "14.0", "13.4.0", true } // Snow Leopard + { "13.0", "14.0", "13.5.0", true }, // Snow Leopard + { "14.0", "", "14.0.3", true } // Lion }; static const VersionRangeDefinition kFlip4MacVersionRange[] = { { "", "", "2.2.1", true } @@ -93,7 +94,8 @@ static const VersionRangeDefinition kQuicktimeVersionRange[] = { { "", "", "7.6.9", true } }; static const VersionRangeDefinition kJavaVersionRange[] = { - { "0", "7", "6.0.260", true } // "260" is not a typo. + { "0", "7", "6.0.290", true }, // "290" is not a typo. + { "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 @@ -146,12 +148,14 @@ static const PluginGroupDefinition kGroupDefinitions[] = { }; #else // Most importantly, covers desktop Linux. static const VersionRangeDefinition kJavaVersionRange[] = { - { "0", "1.7", "1.6.0.26", true } + { "0", "1.7", "1.6.0.29", true }, + { "1.7", "", "1.7.0.1", true } }; static const VersionRangeDefinition kRedhatIcedTeaVersionRange[] = { - { "0", "1.9", "1.8.8", true }, - { "1.9", "1.10", "1.9.8", true }, + { "0", "1.9", "1.8.10", true }, + { "1.9", "1.10", "1.9.10", true }, + { "1.10", "", "1.10.4", true } }; static const PluginGroupDefinition kGroupDefinitions[] = { |