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

Unified Diff: chrome/browser/browser_process_impl.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
« no previous file with comments | « no previous file | content/browser/plugin_service_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/browser_process_impl.cc
===================================================================
--- chrome/browser/browser_process_impl.cc (revision 205261)
+++ chrome/browser/browser_process_impl.cc (working copy)
@@ -873,9 +873,12 @@
#if defined(OS_POSIX)
// Also find plugins in a user-specific plugins dir,
// e.g. ~/.config/chromium/Plugins.
- base::FilePath user_data_dir;
- if (PathService::Get(chrome::DIR_USER_DATA, &user_data_dir))
- plugin_service->AddExtraPluginDir(user_data_dir.Append("Plugins"));
+ const CommandLine& cmd_line = *CommandLine::ForCurrentProcess();
+ if (!cmd_line.HasSwitch(switches::kDisablePluginsDiscovery)) {
+ base::FilePath user_data_dir;
+ if (PathService::Get(chrome::DIR_USER_DATA, &user_data_dir))
+ plugin_service->AddExtraPluginDir(user_data_dir.Append("Plugins"));
+ }
#endif
// Triggers initialization of the singleton instance on UI thread.
« no previous file with comments | « no previous file | content/browser/plugin_service_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698