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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/resources/plugin_metadata/plugins_win.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
« no previous file with comments | « chrome/browser/resources/plugin_metadata/plugins_mac.json ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/plugin_metadata/plugins_win.json
diff --git a/chrome/browser/resources/plugin_metadata/plugins_win.json b/chrome/browser/resources/plugin_metadata/plugins_win.json
index 08cd734f9ad0479b57d01b7a48323d38fb2bff54..980218c18ba356acceeee8373e466322a1277a86 100644
--- a/chrome/browser/resources/plugin_metadata/plugins_win.json
+++ b/chrome/browser/resources/plugin_metadata/plugins_win.json
@@ -14,42 +14,42 @@
},
"java-runtime-environment": {
"mime_types": [
- "application/x-java-applet",
- "application/x-java-applet;jpi-version=1.7.0_05",
- "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;jpi-version=1.7.0_05",
- "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",
- "application/x-java-vm-npruntime"
+ { "mime_type": "application/x-java-applet" },
+ { "mime_type": "application/x-java-applet;jpi-version=1.7.0_05" },
+ { "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;jpi-version=1.7.0_05" },
+ { "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" },
+ { "mime_type": "application/x-java-vm-npruntime" }
],
"versions": [
{
@@ -76,10 +76,10 @@
},
"realplayer": {
"mime_types": [
- "audio/vnd.rn-realaudio",
- "video/vnd.rn-realvideo",
- "audio/x-pn-realaudio-plugin",
- "audio/x-pn-realaudio"
+ { "mime_type": "audio/vnd.rn-realaudio" },
+ { "mime_type": "video/vnd.rn-realvideo" },
+ { "mime_type": "audio/x-pn-realaudio-plugin" },
+ { "mime_type": "audio/x-pn-realaudio" }
],
"versions": [
{
@@ -96,8 +96,8 @@
},
"adobe-flash-player": {
"mime_types": [
- "application/futuresplash",
- "application/x-shockwave-flash"
+ { "mime_type": "application/futuresplash" },
+ { "mime_type": "application/x-shockwave-flash" }
],
"versions": [
{
@@ -115,7 +115,7 @@
},
"adobe-shockwave": {
"mime_types": [
- "application/x-director"
+ { "mime_type": "application/x-director" }
],
"versions": [
{
@@ -132,12 +132,12 @@
},
"adobe-reader": {
"mime_types": [
- "application/pdf",
- "application/vnd.adobe.x-mars",
- "application/vnd.adobe.xdp+xml",
- "application/vnd.adobe.xfd+xml",
- "application/vnd.adobe.xfdf",
- "application/vnd.fdf"
+ { "mime_type": "application/pdf" },
+ { "mime_type": "application/vnd.adobe.x-mars" },
+ { "mime_type": "application/vnd.adobe.xdp+xml" },
+ { "mime_type": "application/vnd.adobe.xfd+xml" },
+ { "mime_type": "application/vnd.adobe.xfdf" },
+ { "mime_type": "application/vnd.fdf" }
],
"versions": [
{
@@ -163,55 +163,55 @@
},
"apple-quicktime": {
"mime_types": [
- "application/sdp",
- "application/x-mpeg",
- "application/x-rtsp",
- "application/x-sdp",
- "audio/3ggp",
- "audio/3ggp2",
- "audio/aac",
- "audio/ac3",
- "audio/aiff",
- "audio/amr",
- "audio/basic",
- "audio/mid",
- "audio/midi",
- "audio/mp4",
- "audio/mpeg",
- "audio/vnd.qcelp",
- "audio/wav",
- "audio/x-aac",
- "audio/x-ac3",
- "audio/x-aiff",
- "audio/x-caf",
- "audio/x-gsm",
- "audio/x-m4a",
- "audio/x-m4b",
- "audio/x-m4p",
- "audio/x-midi",
- "audio/x-mpeg",
- "audio/x-wav",
- "image/jp2",
- "image/jpeg2000",
- "image/jpeg2000-image",
- "image/pict",
- "image/png",
- "image/x-jpeg2000-image",
- "image/x-macpaint",
- "image/x-pict",
- "image/x-png",
- "image/x-quicktime",
- "image/x-sgi",
- "image/x-targa",
- "video/3ggp",
- "video/3ggp2",
- "video/flc",
- "video/mp4",
- "video/mpeg",
- "video/quicktime",
- "video/sd-video",
- "video/x-m4v",
- "video/x-mpeg"
+ { "mime_type": "application/sdp" },
+ { "mime_type": "application/x-mpeg" },
+ { "mime_type": "application/x-rtsp" },
+ { "mime_type": "application/x-sdp" },
+ { "mime_type": "audio/3ggp" },
+ { "mime_type": "audio/3ggp2" },
+ { "mime_type": "audio/aac" },
+ { "mime_type": "audio/ac3" },
+ { "mime_type": "audio/aiff" },
+ { "mime_type": "audio/amr" },
+ { "mime_type": "audio/basic" },
+ { "mime_type": "audio/mid" },
+ { "mime_type": "audio/midi" },
+ { "mime_type": "audio/mp4" },
+ { "mime_type": "audio/mpeg" },
+ { "mime_type": "audio/vnd.qcelp" },
+ { "mime_type": "audio/wav" },
+ { "mime_type": "audio/x-aac" },
+ { "mime_type": "audio/x-ac3" },
+ { "mime_type": "audio/x-aiff" },
+ { "mime_type": "audio/x-caf" },
+ { "mime_type": "audio/x-gsm" },
+ { "mime_type": "audio/x-m4a" },
+ { "mime_type": "audio/x-m4b" },
+ { "mime_type": "audio/x-m4p" },
+ { "mime_type": "audio/x-midi" },
+ { "mime_type": "audio/x-mpeg" },
+ { "mime_type": "audio/x-wav" },
+ { "mime_type": "image/jp2" },
+ { "mime_type": "image/jpeg2000" },
+ { "mime_type": "image/jpeg2000-image" },
+ { "mime_type": "image/pict" },
+ { "mime_type": "image/png" },
+ { "mime_type": "image/x-jpeg2000-image" },
+ { "mime_type": "image/x-macpaint" },
+ { "mime_type": "image/x-pict" },
+ { "mime_type": "image/x-png" },
+ { "mime_type": "image/x-quicktime" },
+ { "mime_type": "image/x-sgi" },
+ { "mime_type": "image/x-targa" },
+ { "mime_type": "video/3ggp" },
+ { "mime_type": "video/3ggp2" },
+ { "mime_type": "video/flc" },
+ { "mime_type": "video/mp4" },
+ { "mime_type": "video/mpeg" },
+ { "mime_type": "video/quicktime" },
+ { "mime_type": "video/sd-video" },
+ { "mime_type": "video/x-m4v" },
+ { "mime_type": "video/x-mpeg" }
],
"versions": [
{
@@ -227,16 +227,16 @@
},
"windows-media-player": {
"mime_types": [
- "application/asx",
- "application/x-mplayer2",
- "application/x-ms-wmp",
- "audio/x-ms-wax",
- "audio/x-ms-wma",
- "video/x-ms-asf",
- "video/x-ms-asf-plugin",
- "video/x-ms-wm",
- "video/x-ms-wmv",
- "video/x-ms-wvx"
+ { "mime_type": "application/asx" },
+ { "mime_type": "application/x-mplayer2" },
+ { "mime_type": "application/x-ms-wmp" },
+ { "mime_type": "audio/x-ms-wax" },
+ { "mime_type": "audio/x-ms-wma" },
+ { "mime_type": "video/x-ms-asf" },
+ { "mime_type": "video/x-ms-asf-plugin" },
+ { "mime_type": "video/x-ms-wm" },
+ { "mime_type": "video/x-ms-wmv" },
+ { "mime_type": "video/x-ms-wvx" }
],
"lang": "en-US",
"name": "Windows Media Player",
@@ -247,8 +247,8 @@
},
"divx-player": {
"mime_types": [
- "video/divx",
- "video/x-matroska"
+ { "mime_type": "video/divx" },
+ { "mime_type": "video/x-matroska" }
],
"versions": [
{
@@ -264,8 +264,8 @@
},
"silverlight": {
"mime_types": [
- "application/x-silverlight",
- "application/x-silverlight-2"
+ { "mime_type": "application/x-silverlight" },
+ { "mime_type": "application/x-silverlight-2" }
],
"versions": [
{
« no previous file with comments | « chrome/browser/resources/plugin_metadata/plugins_mac.json ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698