diff options
| author | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-29 21:50:27 +0000 |
|---|---|---|
| committer | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-29 21:50:27 +0000 |
| commit | 9a1c426f262f4fbf5a4bfbf89922abe175fe5e58 (patch) | |
| tree | ed0cccff27ebe22e69e60a7100f276ce112124fb /chrome/common | |
| parent | e974b3f372b31e7c9bf4bfb345df65740fc2076a (diff) | |
| download | chromium_src-9a1c426f262f4fbf5a4bfbf89922abe175fe5e58.zip chromium_src-9a1c426f262f4fbf5a4bfbf89922abe175fe5e58.tar.gz chromium_src-9a1c426f262f4fbf5a4bfbf89922abe175fe5e58.tar.bz2 | |
Add switch for specifying a directory to load plugins, so that test plugins can be loaded on the Mac without modifying the application bundle.
BUG=47305
TEST=Mac plugin tests still run. No PlugIns directory created in the app bundle.
Review URL: http://codereview.chromium.org/2814030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51174 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
| -rw-r--r-- | chrome/common/chrome_switches.cc | 3 | ||||
| -rw-r--r-- | chrome/common/chrome_switches.h | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc index 6941558..72e3aa8 100644 --- a/chrome/common/chrome_switches.cc +++ b/chrome/common/chrome_switches.cc @@ -537,6 +537,9 @@ const char kLoadExtension[] = "load-extension"; // Load an NPAPI plugin from the specified path. const char kLoadPlugin[] = "load-plugin"; +// Load NPAPI plugins from the specified directory. +const char kExtraPluginDir[] = "extra-plugin-dir"; + // Will filter log messages to show only the messages that are prefixed // with the specified value. See also kEnableLogging and kLoggingLevel. const char kLogFilterPrefix[] = "log-filter-prefix"; diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h index d8c1e12..239734e 100644 --- a/chrome/common/chrome_switches.h +++ b/chrome/common/chrome_switches.h @@ -163,6 +163,7 @@ extern const char kInternalPepper[]; extern const char kJavaScriptFlags[]; extern const char kLoadExtension[]; extern const char kLoadPlugin[]; +extern const char kExtraPluginDir[]; extern const char kLogFilterPrefix[]; extern const char kLogPluginMessages[]; extern const char kLoggingLevel[]; |