diff options
| author | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-14 16:41:10 +0000 |
|---|---|---|
| committer | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-14 16:41:10 +0000 |
| commit | 5190820d106c68f7de1154818998ab1630fea49c (patch) | |
| tree | 2f845e54445f2684da9f53c5b78b3932f7a4eb01 /webkit/glue/plugins | |
| parent | 2289c29f0bdb08738db7da0b09768985692ea647 (diff) | |
| download | chromium_src-5190820d106c68f7de1154818998ab1630fea49c.zip chromium_src-5190820d106c68f7de1154818998ab1630fea49c.tar.gz chromium_src-5190820d106c68f7de1154818998ab1630fea49c.tar.bz2 | |
Update Mac plugin whitelist/blacklist
Whitelist the Google Earth plugin on the Mac
Move QuakeLive from the blacklist to the whitelist
BUG=24788
TEST=For Google Earth, no change (but if we switch back to blacklist by default it will still load). For Quake Live, visit quakelive.com with a spoofed Safari UA, and play.
Review URL: http://codereview.chromium.org/542066
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36242 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/plugins')
| -rw-r--r-- | webkit/glue/plugins/plugin_list_mac.mm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/webkit/glue/plugins/plugin_list_mac.mm b/webkit/glue/plugins/plugin_list_mac.mm index 1cfcdfc..563838b 100644 --- a/webkit/glue/plugins/plugin_list_mac.mm +++ b/webkit/glue/plugins/plugin_list_mac.mm @@ -84,7 +84,6 @@ bool PluginList::ShouldLoadPlugin(const WebPluginInfo& info, // Plugins that we know don't work at all. const char* blacklisted_plugin_mimes[] = { "application/x-googlegears", // Safari-specific. - "application/x-id-quakelive", // Crashes on load. "application/x-vnd.movenetworks.qm", // Crashes on Snow Leopard. "application/vnd.o3d.auto", // Doesn't render, and having it // detected can prevent fallbacks. @@ -99,8 +98,10 @@ bool PluginList::ShouldLoadPlugin(const WebPluginInfo& info, // Plugins that we know are working reasonably well. const char* whitelisted_plugin_mimes[] = { + "application/geplugin", "application/googletalk", "application/vnd.npapi-test", + "application/x-id-quakelive", "application/x-picasa-detect", "application/x-shockwave-flash", "application/x-silverlight", |