summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--webkit/glue/plugins/plugin_list_mac.mm17
1 files changed, 4 insertions, 13 deletions
diff --git a/webkit/glue/plugins/plugin_list_mac.mm b/webkit/glue/plugins/plugin_list_mac.mm
index cbec656..e568c41 100644
--- a/webkit/glue/plugins/plugin_list_mac.mm
+++ b/webkit/glue/plugins/plugin_list_mac.mm
@@ -40,24 +40,15 @@ void GetPluginPrivateDirectory(std::vector<FilePath>* plugin_dirs) {
// Returns true if the plugin should be prevented from loading.
bool IsBlacklistedPlugin(const WebPluginInfo& info) {
- std::string plugin_name = WideToUTF8(info.name);
- // Non-functional, so it's better to let PDFs be downloaded.
- if (plugin_name == "PDF Browser Plugin")
- return true;
-
- // We blacklist a couple of plugins by included MIME type, since those are
- // more stable than their names. Be careful about adding any more plugins to
- // this list though, since it's easy to accidentally blacklist plugins that
- // support lots of MIME types.
+ // We blacklist Gears by included MIME type, since that is more stable than
+ // its name. Be careful about adding any more plugins to this list though,
+ // since it's easy to accidentally blacklist plugins that support lots of
+ // MIME types.
for (std::vector<WebPluginMimeType>::const_iterator i =
info.mime_types.begin(); i != info.mime_types.end(); ++i) {
// The Gears plugin is Safari-specific, so don't load it.
if (i->mime_type == "application/x-googlegears")
return true;
- // The current version of O3D doesn't work (and overrealeases our dummy
- // window). Waiting for a new release with recent fixes.
- if (i->mime_type == "application/vnd.o3d.auto")
- return true;
}
return false;