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. |