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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: webkit/default_plugin/plugins2.xml

Issue 164510: Merge 23034 - Update the plugin finder service with the latest URLs.... (Closed) Base URL: svn://chrome-svn/chrome/branches/195/src/
Patch Set: Created 11 years, 4 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')
Property Changes:
Added: svn:mergeinfo
Merged /branches/chrome_webkit_merge_branch/src/webkit/default_plugin/plugins2.xml:r3734-4217,4606-5108,5177-5263
Merged /trunk/src/webkit/default_plugin/plugins2.xml:r23034
OLDNEW
1 <plugins> 1 <plugins>
2 <plugin> 2 <plugin>
3 <mime_types>application/x-java-applet;application/x-java-bean;applicatio n/x-java-vm;application/x-java-applet,version=1.1.1;application/x-java-bean,vers ion=1.1.1;application/x-java-applet,version=1.1;application/x-java-bean,version= 1.1;application/x-java-applet,version=1.2;application/x-java-bean,version=1.2;ap plication/x-java-applet,version=1.1.3;application/x-java-bean,version=1.1.3;appl ication/x-java-applet,version=1.1.2;application/x-java-bean,version=1.1.2;applic ation/x-java-applet,version=1.3;application/x-java-bean,version=1.3;application/ x-java-applet,version=1.2.2;application/x-java-bean,version=1.2.2;application/x- java-applet,version=1.2.1;application/x-java-bean,version=1.2.1;application/x-ja va-applet,version=1.3.1;application/x-java-bean,version=1.3.1;application/x-java -applet,version=1.4;application/x-java-bean,version=1.4;application/x-java-apple t,version=1.4.1;application/x-java-bean,version=1.4.1;application/x-java-applet, version=1.4.2;application/x-java-bean,version=1.4.2;application/x-java-applet,ve rsion=1.5;application/x-java-bean,version=1.5;application/x-java-applet,version= 1.6;application/x-java-bean,version=1.6;</mime_types> 3 <mime_types>application/x-java-applet;application/x-java-bean;applicatio n/x-java-vm;application/x-java-applet,version=1.1.1;application/x-java-bean,vers ion=1.1.1;application/x-java-applet,version=1.1;application/x-java-bean,version= 1.1;application/x-java-applet,version=1.2;application/x-java-bean,version=1.2;ap plication/x-java-applet,version=1.1.3;application/x-java-bean,version=1.1.3;appl ication/x-java-applet,version=1.1.2;application/x-java-bean,version=1.1.2;applic ation/x-java-applet,version=1.3;application/x-java-bean,version=1.3;application/ x-java-applet,version=1.2.2;application/x-java-bean,version=1.2.2;application/x- java-applet,version=1.2.1;application/x-java-bean,version=1.2.1;application/x-ja va-applet,version=1.3.1;application/x-java-bean,version=1.3.1;application/x-java -applet,version=1.4;application/x-java-bean,version=1.4;application/x-java-apple t,version=1.4.1;application/x-java-bean,version=1.4.1;application/x-java-applet, version=1.4.2;application/x-java-bean,version=1.4.2;application/x-java-applet,ve rsion=1.5;application/x-java-bean,version=1.5;application/x-java-applet,version= 1.6;application/x-java-bean,version=1.6;</mime_types>
4 <lang>en-us</lang> 4 <lang>en-us</lang>
5 <name>Java(TM)</name> 5 <name>Java(TM)</name>
6 <url>http://java.com/en/download/</url> 6 <url>http://java.com/en/download/</url>
7 <displayurl>1</displayurl> 7 <displayurl>1</displayurl>
8 </plugin> 8 </plugin>
9 9
10 <plugin> 10 <plugin>
11 <mime_types>audio/x-pn-realaudio-plugin;audio/x-pn-realaudio;audio/vnd.r n-realaudio;video/vnd.rn-realvideo</mime_types> 11 <mime_types>audio/x-pn-realaudio-plugin;audio/x-pn-realaudio;audio/vnd.r n-realaudio;video/vnd.rn-realvideo</mime_types>
12 <lang>en-us</lang> 12 <lang>en-us</lang>
13 <name>Real player</name> 13 <name>Real player</name>
14 <url>http://software-dl.real.com/free/windows/installer/R41R02F/RealPlay er11GOLD.exe</url> 14 <url>http://software-dl.real.com/free/windows/installer/R41R02F/RealPlay er11GOLD.exe</url>
15 </plugin> 15 </plugin>
16 16
17 <plugin> 17 <plugin>
18 <mime_types>application/x-shockwave-flash;application/futuresplash</mime _types> 18 <mime_types>application/x-shockwave-flash;application/futuresplash</mime _types>
19 <lang>en-us</lang> 19 <lang>en-us</lang>
20 <name>Adobe Flash Movie</name> 20 <name>Adobe Flash Movie</name>
21 » <url>http://fpdownload.macromedia.com/get/flashplayer/current/install_fl ash_player.exe</url> 21 <url>http://fpdownload.adobe.com/get/flashplayer/current/install_flash_playe r.exe</url>
22 </plugin> 22 </plugin>
23 23
24 <plugin> 24 <plugin>
25 <mime_types>application/x-director</mime_types> 25 <mime_types>application/x-director</mime_types>
26 <lang>en-us</lang> 26 <lang>en-us</lang>
27 <name>Adobe Shockwave Movie</name> 27 <name>Adobe Shockwave Movie</name>
28 » <url>http://fpdownload.macromedia.com/get/shockwave/default/english/win9 5nt/10.2.0.023/Shockwave_Installer_Slim.exe</url> 28 » <url>http://fpdownload.macromedia.com/get/shockwave/default/english/win9 5nt/latest/Shockwave_Installer_Slim.exe</url>
29 </plugin> 29 </plugin>
30 30
31 <plugin> 31 <plugin>
32 <mime_types>application/pdf;application/vnd.adobe.x-mars;application/vnd .fdf;application/vnd.adobe.xfdf;application/vnd.adobe.xdp+xml;application/vnd.ad obe.xfd+xml;</mime_types> 32 <mime_types>application/pdf;application/vnd.adobe.x-mars;application/vnd .fdf;application/vnd.adobe.xfdf;application/vnd.adobe.xdp+xml;application/vnd.ad obe.xfd+xml;</mime_types>
33 <lang>en-us</lang> 33 <lang>en-us</lang>
34 <name>Adobe Acrobat</name> 34 <name>Adobe Acrobat</name>
35 » <url>http://ardownload.adobe.com/pub/adobe/reader/win/8.x/8.1.2/enu/Adbe Rdr812_en_US.exe</url> 35 » <url>http://ardownload.adobe.com/pub/adobe/reader/win/9.x/9.1/enu/AdbeRd r910_en_US.exe</url>
36 </plugin> 36 </plugin>
37 37
38 <plugin> 38 <plugin>
39 <mime_types>video/quicktime;application/sdp;application/x-sdp;applicat ion/x-rtsp;video/flc;audio/x-wav;audio/wav;audio/aiff;audio/x-aiff;audio/basic;a udio/mid;audio/x-midi;audio/midi;audio/vnd.qcelp;audio/x-gsm;audio/amr;audio/aac ;audio/x-aac;audio/x-caf;audio/ac3;audio/x-ac3;video/x-mpeg;video/mpeg;audio/mpe g;audio/x-mpeg;video/3ggp;audio/3ggp;video/3ggp2;audio/3ggp2;video/sd-video;appl ication/x-mpeg;video/mp4;audio/mp4;audio/x-m4a;audio/x-m4p;audio/x-m4b;video/x-m 4v;image/x-macpaint;image/pict;image/x-pict;image/png;image/x-png;image/x-quickt ime;image/x-sgi;image/x-targa;image/jp2;image/jpeg2000;image/jpeg2000-image;imag e/x-jpeg2000-image</mime_types> 39 <mime_types>video/quicktime;application/sdp;application/x-sdp;applicat ion/x-rtsp;video/flc;audio/x-wav;audio/wav;audio/aiff;audio/x-aiff;audio/basic;a udio/mid;audio/x-midi;audio/midi;audio/vnd.qcelp;audio/x-gsm;audio/amr;audio/aac ;audio/x-aac;audio/x-caf;audio/ac3;audio/x-ac3;video/x-mpeg;video/mpeg;audio/mpe g;audio/x-mpeg;video/3ggp;audio/3ggp;video/3ggp2;audio/3ggp2;video/sd-video;appl ication/x-mpeg;video/mp4;audio/mp4;audio/x-m4a;audio/x-m4p;audio/x-m4b;video/x-m 4v;image/x-macpaint;image/pict;image/x-pict;image/png;image/x-png;image/x-quickt ime;image/x-sgi;image/x-targa;image/jp2;image/jpeg2000;image/jpeg2000-image;imag e/x-jpeg2000-image</mime_types>
40 <lang>en-us</lang> 40 <lang>en-us</lang>
41 <name>Quicktime player</name> 41 <name>Quicktime player</name>
42 » <url>http://wsidecar.apple.com/cgi-bin/nph-reg3rdpty2.pl/product=19502 &amp;cat=59&amp;platform=osx&amp;method=sa/QuickTimeInstaller.exe</url> 42 » <url>http://appldnld.apple.com.edgesuite.net/content.info.apple.com/Qu ickTime/061-6118.20090601.Pq3V9/QuickTimeInstaller.exe</url>
43 </plugin> 43 </plugin>
44 44
45 </plugins> 45 </plugins>
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