Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(833)

Side by Side Diff: webkit/plugins/npapi/plugin_list.cc

Issue 7046039: JRE6u26 sounds like it fixes some pretty nasty bugs: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "webkit/plugins/npapi/plugin_list.h" 5 #include "webkit/plugins/npapi/plugin_list.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/lazy_instance.h" 10 #include "base/lazy_instance.h"
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 kShockwaveDefinition 86 kShockwaveDefinition
87 }; 87 };
88 88
89 #elif defined(OS_WIN) 89 #elif defined(OS_WIN)
90 // TODO(panayiotis): We should group "RealJukebox NS Plugin" with the rest of 90 // TODO(panayiotis): We should group "RealJukebox NS Plugin" with the rest of
91 // the RealPlayer files. 91 // the RealPlayer files.
92 static const VersionRangeDefinition kQuicktimeVersionRange[] = { 92 static const VersionRangeDefinition kQuicktimeVersionRange[] = {
93 { "", "", "7.6.9", true } 93 { "", "", "7.6.9", true }
94 }; 94 };
95 static const VersionRangeDefinition kJavaVersionRange[] = { 95 static const VersionRangeDefinition kJavaVersionRange[] = {
96 { "0", "7", "6.0.240", true } // "240" is not a typo. 96 { "0", "7", "6.0.260", true } // "260" is not a typo.
97 }; 97 };
98 // This is up to date with 98 // This is up to date with
99 // http://www.adobe.com/support/security/bulletins/apsb11-08.html 99 // http://www.adobe.com/support/security/bulletins/apsb11-08.html
100 static const VersionRangeDefinition kAdobeReaderVersionRange[] = { 100 static const VersionRangeDefinition kAdobeReaderVersionRange[] = {
101 { "10", "11", "10.0.1", false }, 101 { "10", "11", "10.0.1", false },
102 { "9", "10", "9.4.4", false }, 102 { "9", "10", "9.4.4", false },
103 { "0", "9", "8.2.6", false } 103 { "0", "9", "8.2.6", false }
104 }; 104 };
105 static const VersionRangeDefinition kDivXVersionRange[] = { 105 static const VersionRangeDefinition kDivXVersionRange[] = {
106 { "", "", "1.4.3.4", false } 106 { "", "", "1.4.3.4", false }
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 NULL, 0, "" }, 139 NULL, 0, "" },
140 }; 140 };
141 141
142 #elif defined(OS_CHROMEOS) 142 #elif defined(OS_CHROMEOS)
143 // ChromeOS generally has (autoupdated) system plug-ins and no user-installable 143 // ChromeOS generally has (autoupdated) system plug-ins and no user-installable
144 // plug-ins. 144 // plug-ins.
145 static const PluginGroupDefinition kGroupDefinitions[] = { }; 145 static const PluginGroupDefinition kGroupDefinitions[] = { };
146 146
147 #else // Most importantly, covers desktop Linux. 147 #else // Most importantly, covers desktop Linux.
148 static const VersionRangeDefinition kJavaVersionRange[] = { 148 static const VersionRangeDefinition kJavaVersionRange[] = {
149 { "0", "1.7", "1.6.0.24", true } 149 { "0", "1.7", "1.6.0.26", true }
150 }; 150 };
151 151
152 static const VersionRangeDefinition kRedhatIcedTeaVersionRange[] = { 152 static const VersionRangeDefinition kRedhatIcedTeaVersionRange[] = {
153 { "0", "1.9", "1.8.7", true }, 153 { "0", "1.9", "1.8.7", true },
154 { "1.9", "1.10", "1.9.7", true }, 154 { "1.9", "1.10", "1.9.7", true },
155 }; 155 };
156 156
157 static const PluginGroupDefinition kGroupDefinitions[] = { 157 static const PluginGroupDefinition kGroupDefinitions[] = {
158 // Flash on Linux is significant because there isn't yet a built-in Flash 158 // Flash on Linux is significant because there isn't yet a built-in Flash
159 // plug-in on the Linux 64-bit version of Chrome. 159 // plug-in on the Linux 64-bit version of Chrome.
(...skipping 674 matching lines...) Expand 10 before | Expand all | Expand 10 after
834 void PluginList::DisableOutdatedPluginGroups() { 834 void PluginList::DisableOutdatedPluginGroups() {
835 disable_outdated_plugins_ = true; 835 disable_outdated_plugins_ = true;
836 } 836 }
837 837
838 PluginList::~PluginList() { 838 PluginList::~PluginList() {
839 } 839 }
840 840
841 841
842 } // namespace npapi 842 } // namespace npapi
843 } // namespace webkit 843 } // namespace webkit
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698