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 /webkit/glue | |
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 'webkit/glue')
-rw-r--r-- | webkit/glue/plugins/plugin_list_mac.mm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/webkit/glue/plugins/plugin_list_mac.mm b/webkit/glue/plugins/plugin_list_mac.mm index e568c41..16bde9d 100644 --- a/webkit/glue/plugins/plugin_list_mac.mm +++ b/webkit/glue/plugins/plugin_list_mac.mm @@ -69,7 +69,8 @@ void PluginList::GetPluginDirectories(std::vector<FilePath>* plugin_dirs) { // Load from the machine-wide area GetPluginCommonDirectory(plugin_dirs, false); - // Load any bundled plugins + // Load any bundled plugins (deprecated) + // TODO(stuartmorgan): Remove this once it's not used in TestShell. GetPluginPrivateDirectory(plugin_dirs); } |