diff options
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/plugins/plugin_list_mac.mm | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/webkit/glue/plugins/plugin_list_mac.mm b/webkit/glue/plugins/plugin_list_mac.mm index 28cf21d..90391ec 100644 --- a/webkit/glue/plugins/plugin_list_mac.mm +++ b/webkit/glue/plugins/plugin_list_mac.mm @@ -68,15 +68,12 @@ void PluginList::LoadPluginsFromDir(const FilePath &path) { } bool PluginList::ShouldLoadPlugin(const WebPluginInfo& info) { - // TODO(port): uncomment the next line to enable plugins--disabled by - // default so that public dev builds fall back correctly to the no-plugin - // code on pages with plugins. - return false; - // Hierarchy check // (we're loading plugins hierarchically from Library folders, so plugins we // encounter earlier must override plugins we encounter later) + // first, test to make sure the user really wants plugins + for (size_t i = 0; i < plugins_.size(); ++i) { if (plugins_[i].path.BaseName() == info.path.BaseName()) { return false; // We already have a loaded plugin higher in the hierarchy. |