Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(234)

Unified Diff: webkit/plugins/npapi/plugin_list_posix.cc

Issue 16369004: Adding --disable-plugins-discovery command line switch to not load third-party plugins from common … (Closed) Base URL: https://src.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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);

Powered by Google App Engine
This is Rietveld 408576698