| Index: content/public/common/content_switches.cc
|
| ===================================================================
|
| --- content/public/common/content_switches.cc (revision 204062)
|
| +++ content/public/common/content_switches.cc (working copy)
|
| @@ -459,9 +459,6 @@
|
| // - Location platform support for Windows 7
|
| const char kExperimentalLocationFeatures[] = "experimental-location-features";
|
|
|
| -// Load NPAPI plugins from the specified directory.
|
| -const char kExtraPluginDir[] = "extra-plugin-dir";
|
| -
|
| // If accelerated compositing is supported, always enter compositing mode for
|
| // the base layer even when compositing is not strictly required.
|
| const char kForceCompositingMode[] = "force-compositing-mode";
|
| @@ -529,9 +526,17 @@
|
| // Specifies the flags passed to JS engine
|
| const char kJavaScriptFlags[] = "js-flags";
|
|
|
| +// Load NPAPI plugins from the specified directory.
|
| +const char kExtraPluginDir[] = "extra-plugin-dir";
|
| +
|
| // Load an NPAPI plugin from the specified path.
|
| const char kLoadPlugin[] = "load-plugin";
|
|
|
| +// Disable discovering third-party plug-ins. Effectively loading only
|
| +// ones shipped with the browser plus third-party ones as specified by
|
| +// --extra-plugin-dir and --load-plugin switches.
|
| +const char kDisablePluginsDiscovery[] = "disable-plugins-discovery";
|
| +
|
| // Sets the minimum log level. Valid values are from 0 to 3:
|
| // INFO = 0, WARNING = 1, LOG_ERROR = 2, LOG_FATAL = 3.
|
| const char kLoggingLevel[] = "log-level";
|
|
|