| Index: webkit/plugins/npapi/plugin_list_mac.mm
|
| ===================================================================
|
| --- webkit/plugins/npapi/plugin_list_mac.mm (revision 205261)
|
| +++ webkit/plugins/npapi/plugin_list_mac.mm (working copy)
|
| @@ -275,7 +275,11 @@
|
| return false;
|
| }
|
|
|
| -void PluginList::GetPluginDirectories(std::vector<base::FilePath>* plugin_dirs) {
|
| +void PluginList::GetPluginDirectories(
|
| + std::vector<base::FilePath>* plugin_dirs) {
|
| + if (PluginList::plugins_discovery_disabled_)
|
| + return;
|
| +
|
| // Load from the user's area
|
| GetPluginCommonDirectory(plugin_dirs, true);
|
|
|
|
|