| Index: chrome/browser/resources/plugins_linux.json
|
| diff --git a/chrome/browser/resources/plugins_linux.json b/chrome/browser/resources/plugins_linux.json
|
| index d410de02eeff92019beb4bd79af3709ba78032d8..e56f226325c26bb207399a276806cba667bfbe10 100644
|
| --- a/chrome/browser/resources/plugins_linux.json
|
| +++ b/chrome/browser/resources/plugins_linux.json
|
| @@ -1,66 +1,62 @@
|
| {
|
| - "plugins": [
|
| - {
|
| - "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-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-vm"
|
| - ],
|
| - "lang": "en-US",
|
| - "name": "Java(TM)",
|
| - "identifier": "java-runtime-environment",
|
| - "help_url": "https://support.google.com/chrome/?p=plugin_java",
|
| - "url": "http://java.com/download",
|
| - "displayurl": true
|
| - },
|
| - {
|
| - "mime_types": [
|
| - "application/futuresplash",
|
| - "application/x-shockwave-flash"
|
| - ],
|
| - "lang": "en-US",
|
| - "name": "Adobe Flash Player",
|
| - "identifier": "adobe-flash-player",
|
| - "help_url": "https://support.google.com/chrome/?p=plugin_flash",
|
| - "url": "http://get.adobe.com/flashplayer/",
|
| - "displayurl": true
|
| - },
|
| - {
|
| - "mime_types": [
|
| - ],
|
| - "lang": "en-US",
|
| - "name": "IcedTea",
|
| - "identifier": "redhat-icetea-java",
|
| - "url": "http://icedtea.classpath.org/",
|
| - "displayurl": true
|
| - }
|
| - ]
|
| + "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-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-vm"
|
| + ],
|
| + "lang": "en-US",
|
| + "name": "Java(TM)",
|
| + "help_url": "https://support.google.com/chrome/?p=plugin_java",
|
| + "url": "http://java.com/download",
|
| + "displayurl": true
|
| + },
|
| + "adobe-flash-player": {
|
| + "mime_types": [
|
| + "application/futuresplash",
|
| + "application/x-shockwave-flash"
|
| + ],
|
| + "lang": "en-US",
|
| + "name": "Adobe Flash Player",
|
| + "help_url": "https://support.google.com/chrome/?p=plugin_flash",
|
| + "url": "http://get.adobe.com/flashplayer/",
|
| + "requires_authorization": false,
|
| + "displayurl": true
|
| + },
|
| + "redhat-icetea-java": {
|
| + "mime_types": [
|
| + ],
|
| + "lang": "en-US",
|
| + "name": "IcedTea",
|
| + "url": "http://icedtea.classpath.org/",
|
| + "displayurl": true
|
| + }
|
| }
|
|
|