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

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 204062)
+++ webkit/plugins/npapi/plugin_list_posix.cc (working copy)
@@ -435,10 +435,16 @@
// 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_) {
Bernhard Bauer 2013/06/06 08:28:50 Remove braces.
seva 2013/06/06 22:11:25 Done.
+ return;
+ }
+ // Note: "extra" plugin dirs are examined before these. "Extra" include
+ // --extra-plugin-dir, --load-plugin switches, if passed, as well as Plugins
+ // subdirectory of your Chrome config (e.g. ~/.config/chromium/Plugins).
+ // See the logic related to extra_plugin_dirs in plugin_list.cc and
+ // AddExtraPluginDir call in chrome/browser/browser_process_impl.cc.
Bernhard Bauer 2013/06/06 08:28:50 I'm not sure if the comment here should refer to c
seva 2013/06/06 22:11:25 Done.
+
// The Chrome binary dir + "plugins/".
base::FilePath dir;
PathService::Get(base::DIR_EXE, &dir);

Powered by Google App Engine
This is Rietveld 408576698