summaryrefslogtreecommitdiffstats
path: root/webkit/glue
diff options
context:
space:
mode:
authorstuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-30 21:45:23 +0000
committerstuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-30 21:45:23 +0000
commit84e57ef05d05fde3f9e5dbd665a7fd0ec4852b18 (patch)
tree86c3498cdc8f15ed83bf9e837ca49b6843bbc71c /webkit/glue
parent0e71026b3e6a04297c2ed1b65616e83b74508bf8 (diff)
downloadchromium_src-84e57ef05d05fde3f9e5dbd665a7fd0ec4852b18.zip
chromium_src-84e57ef05d05fde3f9e5dbd665a7fd0ec4852b18.tar.gz
chromium_src-84e57ef05d05fde3f9e5dbd665a7fd0ec4852b18.tar.bz2
Blacklist the O3D plugin on the Mac
BUG=25068 TEST=Install O3D, open about:plugins; O3D should not be listed. Review URL: http://codereview.chromium.org/341058 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30637 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
-rw-r--r--webkit/glue/plugins/plugin_list_mac.mm2
1 files changed, 2 insertions, 0 deletions
diff --git a/webkit/glue/plugins/plugin_list_mac.mm b/webkit/glue/plugins/plugin_list_mac.mm
index 3bb23f1..f37f441 100644
--- a/webkit/glue/plugins/plugin_list_mac.mm
+++ b/webkit/glue/plugins/plugin_list_mac.mm
@@ -86,6 +86,8 @@ bool PluginList::ShouldLoadPlugin(const WebPluginInfo& info,
"application/x-director", // Crashes during initialization.
"application/x-googlegears", // Safari-specific.
"application/x-vnd.movenetworks.qm", // Crashes during initialization.
+ "application/vnd.o3d.auto", // Doesn't render, and having it
+ // detected can prevent fallbacks.
};
// In the case of plugins that share MIME types, we have to blacklist by name.
const char* blacklisted_plugin_names[] = {