| Index: webkit/plugins/npapi/plugin_list_posix.cc
|
| ===================================================================
|
| --- webkit/plugins/npapi/plugin_list_posix.cc (revision 204507)
|
| +++ webkit/plugins/npapi/plugin_list_posix.cc (working copy)
|
| @@ -435,10 +435,13 @@
|
| // We first consult Chrome-specific dirs, then fall back on the logic
|
| // Mozilla uses.
|
|
|
| - // Note: "extra" plugin dirs, including the Plugins subdirectory of
|
| - // your Chrome config, are examined before these. See the logic
|
| - // related to extra_plugin_dirs in plugin_list.cc.
|
| + if (PluginList::plugins_discovery_disabled_)
|
| + return;
|
|
|
| + // Note: "extra" plugin dirs and paths are examined before these.
|
| + // "Extra" are those added by PluginList::AddExtraPluginDir() and
|
| + // PluginList::AddExtraPluginPath().
|
| +
|
| // The Chrome binary dir + "plugins/".
|
| base::FilePath dir;
|
| PathService::Get(base::DIR_EXE, &dir);
|
|
|