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

Unified Diff: chrome/browser/resources/plugin_metadata/plugins_linux.json

Issue 11016005: Using MIME types in addition to plugin name to differentiate between plugins. (Closed) Base URL: http://git.chromium.org/chromium/src.git@5_plugins_resource_service
Patch Set: .. Created 8 years, 3 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: chrome/browser/resources/plugin_metadata/plugins_linux.json
diff --git a/chrome/browser/resources/plugin_metadata/plugins_linux.json b/chrome/browser/resources/plugin_metadata/plugins_linux.json
index e3aad1c18c803344dbb6c705b49dc73b1b05e94f..8fe8e6155aa18aaf4d3c9111f76d8def1b735005 100644
--- a/chrome/browser/resources/plugin_metadata/plugins_linux.json
+++ b/chrome/browser/resources/plugin_metadata/plugins_linux.json
@@ -14,39 +14,39 @@
},
"java-runtime-environment": {
"mime_types": [
- "application/x-java-applet",
- "application/x-java-applet,version=1.1",
- "application/x-java-applet,version=1.1.1",
- "application/x-java-applet,version=1.1.2",
- "application/x-java-applet,version=1.1.3",
- "application/x-java-applet,version=1.2",
- "application/x-java-applet,version=1.2.1",
- "application/x-java-applet,version=1.2.2",
- "application/x-java-applet,version=1.3",
- "application/x-java-applet,version=1.3.1",
- "application/x-java-applet,version=1.4",
- "application/x-java-applet,version=1.4.1",
- "application/x-java-applet,version=1.4.2",
- "application/x-java-applet,version=1.5",
- "application/x-java-applet,version=1.6",
- "application/x-java-applet,version=1.7",
- "application/x-java-bean",
- "application/x-java-bean,version=1.1",
- "application/x-java-bean,version=1.1.1",
- "application/x-java-bean,version=1.1.2",
- "application/x-java-bean,version=1.1.3",
- "application/x-java-bean,version=1.2",
- "application/x-java-bean,version=1.2.1",
- "application/x-java-bean,version=1.2.2",
- "application/x-java-bean,version=1.3",
- "application/x-java-bean,version=1.3.1",
- "application/x-java-bean,version=1.4",
- "application/x-java-bean,version=1.4.1",
- "application/x-java-bean,version=1.4.2",
- "application/x-java-bean,version=1.5",
- "application/x-java-bean,version=1.6",
- "application/x-java-bean,version=1.7",
- "application/x-java-vm"
+ { "mime_type": "application/x-java-applet" },
+ { "mime_type": "application/x-java-applet,version=1.1" },
+ { "mime_type": "application/x-java-applet,version=1.1.1" },
+ { "mime_type": "application/x-java-applet,version=1.1.2" },
+ { "mime_type": "application/x-java-applet,version=1.1.3" },
+ { "mime_type": "application/x-java-applet,version=1.2" },
+ { "mime_type": "application/x-java-applet,version=1.2.1" },
+ { "mime_type": "application/x-java-applet,version=1.2.2" },
+ { "mime_type": "application/x-java-applet,version=1.3" },
+ { "mime_type": "application/x-java-applet,version=1.3.1" },
+ { "mime_type": "application/x-java-applet,version=1.4" },
+ { "mime_type": "application/x-java-applet,version=1.4.1" },
+ { "mime_type": "application/x-java-applet,version=1.4.2" },
+ { "mime_type": "application/x-java-applet,version=1.5" },
+ { "mime_type": "application/x-java-applet,version=1.6" },
+ { "mime_type": "application/x-java-applet,version=1.7" },
+ { "mime_type": "application/x-java-bean" },
+ { "mime_type": "application/x-java-bean,version=1.1" },
+ { "mime_type": "application/x-java-bean,version=1.1.1" },
+ { "mime_type": "application/x-java-bean,version=1.1.2" },
+ { "mime_type": "application/x-java-bean,version=1.1.3" },
+ { "mime_type": "application/x-java-bean,version=1.2" },
+ { "mime_type": "application/x-java-bean,version=1.2.1" },
+ { "mime_type": "application/x-java-bean,version=1.2.2" },
+ { "mime_type": "application/x-java-bean,version=1.3" },
+ { "mime_type": "application/x-java-bean,version=1.3.1" },
+ { "mime_type": "application/x-java-bean,version=1.4" },
+ { "mime_type": "application/x-java-bean,version=1.4.1" },
+ { "mime_type": "application/x-java-bean,version=1.4.2" },
+ { "mime_type": "application/x-java-bean,version=1.5" },
+ { "mime_type": "application/x-java-bean,version=1.6" },
+ { "mime_type": "application/x-java-bean,version=1.7" },
+ { "mime_type": "application/x-java-vm" }
],
"versions": [
{
@@ -71,8 +71,8 @@
},
"adobe-flash-player": {
"mime_types": [
- "application/futuresplash",
- "application/x-shockwave-flash"
+ { "mime_type": "application/futuresplash", "used_in_matching": true },
+ { "mime_type": "application/x-shockwave-flash" }
],
"versions": [
{
@@ -88,6 +88,27 @@
"displayurl": true,
"group_name_matcher": "Shockwave Flash"
},
+ "lightspark": {
+ "mime_types": [
+ {
+ "mime_type": "application/x-lightspark",
+ "used_in_matching": true
+ },
+ {
+ "mime_type": "application/x-shockwave-flash"
+ }
+ ],
+ "versions": [
+ {
+ "version": "11.1.102",
+ "status": "up_to_date",
+ "reference": "http://www.adobe.com/support/security/bulletins/apsb12-03.html"
+ }
+ ],
+ "name": "Light Spark",
+ "displayurl": true,
+ "group_name_matcher": "Shockwave Flash"
+ },
"redhat-icetea-java": {
"mime_types": [
],
« no previous file with comments | « chrome/browser/plugins/plugin_metadata.cc ('k') | chrome/browser/resources/plugin_metadata/plugins_mac.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698