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

Unified Diff: webkit/plugins/npapi/plugin_list.cc

Issue 6350010: Put some plug-ins behind an infobar, where they have:... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: webkit/plugins/npapi/plugin_list.cc
===================================================================
--- webkit/plugins/npapi/plugin_list.cc (revision 72249)
+++ webkit/plugins/npapi/plugin_list.cc (working copy)
@@ -60,21 +60,23 @@
static const VersionRangeDefinition kShockwaveVersionRange[] = {
{ "", "", "11.5.9.615" }
};
+// TODO(cevans) - I don't see Adobe Reader in here for Mac.
static const PluginGroupDefinition kGroupDefinitions[] = {
kFlashDefinition,
- { "apple-quicktime", "Quicktime", "QuickTime Plug-in", kQuicktimeVersionRange,
- arraysize(kQuicktimeVersionRange),
+ { "apple-quicktime", PluginGroup::kQuickTimeGroupName, "QuickTime Plug-in",
+ kQuicktimeVersionRange, arraysize(kQuicktimeVersionRange),
"http://www.apple.com/quicktime/download/" },
- { "java-runtime-environment", "Java", "Java", kJavaVersionRange,
- arraysize(kJavaVersionRange), "http://support.apple.com/kb/HT1338" },
+ { "java-runtime-environment", PluginGroup::kJavaGroupName, "Java",
+ kJavaVersionRange, arraysize(kJavaVersionRange),
+ "http://support.apple.com/kb/HT1338" },
{ "silverlight", "Silverlight", "Silverlight", kSilverlightVersionRange,
arraysize(kSilverlightVersionRange),
"http://www.microsoft.com/getsilverlight/" },
{ "flip4mac", "Flip4Mac", "Flip4Mac", kFlip4MacVersionRange,
arraysize(kFlip4MacVersionRange),
"http://www.telestream.net/flip4mac-wmv/overview.htm" },
- { "shockwave", "Shockwave", "Shockwave for Director", kShockwaveVersionRange,
- arraysize(kShockwaveVersionRange),
+ { "shockwave", PluginGroup::kShockwaveGroupName, "Shockwave for Director",
+ kShockwaveVersionRange, arraysize(kShockwaveVersionRange),
"http://www.adobe.com/shockwave/download/" }
};
@@ -104,19 +106,19 @@
};
static const PluginGroupDefinition kGroupDefinitions[] = {
kFlashDefinition,
- { "apple-quicktime", "Quicktime", "QuickTime Plug-in", kQuicktimeVersionRange,
- arraysize(kQuicktimeVersionRange),
+ { "apple-quicktime", PluginGroup::kQuickTimeGroupName, "QuickTime Plug-in",
+ kQuicktimeVersionRange, arraysize(kQuicktimeVersionRange),
"http://www.apple.com/quicktime/download/" },
- { "java-runtime-environment", "Java 6", "Java", kJavaVersionRange,
- arraysize(kJavaVersionRange), "http://www.java.com/" },
+ { "java-runtime-environment", PluginGroup::kJavaGroupName, "Java",
+ kJavaVersionRange, arraysize(kJavaVersionRange), "http://www.java.com/" },
{ "adobe-reader", PluginGroup::kAdobeReaderGroupName, "Adobe Acrobat",
kAdobeReaderVersionRange, arraysize(kAdobeReaderVersionRange),
"http://get.adobe.com/reader/" },
{ "silverlight", "Silverlight", "Silverlight", kSilverlightVersionRange,
arraysize(kSilverlightVersionRange),
"http://www.microsoft.com/getsilverlight/" },
- { "shockwave", "Shockwave", "Shockwave for Director", kShockwaveVersionRange,
- arraysize(kShockwaveVersionRange),
+ { "shockwave", PluginGroup::kShockwaveGroupName, "Shockwave for Director",
+ kShockwaveVersionRange, arraysize(kShockwaveVersionRange),
"http://www.adobe.com/shockwave/download/" },
{ "divx-player", "DivX Player", "DivX Web Player", kDivXVersionRange,
arraysize(kDivXVersionRange),
@@ -148,11 +150,11 @@
// Flash on Linux is significant because there isn't yet a built-in Flash
// plug-in on the Linux 64-bit version of Chrome.
kFlashDefinition,
- { "java-runtime-environment", "Java 6", "Java", kJavaVersionRange,
- arraysize(kJavaVersionRange),
+ { "java-runtime-environment", PluginGroup::kJavaGroupName, "Java",
+ kJavaVersionRange, arraysize(kJavaVersionRange),
"http://www.java.com/en/download/manual.jsp" },
- { "redhat-icetea-java", "IcedTea", "IcedTea", kRedhatIcedTeaVersionRange,
- arraysize(kRedhatIcedTeaVersionRange),
+ { "redhat-icetea-java", PluginGroup::kIcedTeaGroupName, "IcedTea",
+ kRedhatIcedTeaVersionRange, arraysize(kRedhatIcedTeaVersionRange),
"http://www.linuxsecurity.com/content/section/3/170/" },
};
#endif
« webkit/plugins/npapi/plugin_group.cc ('K') | « webkit/plugins/npapi/plugin_group.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698