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 | |
| 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')
| -rw-r--r-- | webkit/glue/plugins/plugin_list_mac.mm | 3 | ||||
| -rw-r--r-- | webkit/tools/pepper_test_plugin/README | 6 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_shell.gypi | 2 |
3 files changed, 5 insertions, 6 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); } diff --git a/webkit/tools/pepper_test_plugin/README b/webkit/tools/pepper_test_plugin/README index 76062bd..6184b5e 100644 --- a/webkit/tools/pepper_test_plugin/README +++ b/webkit/tools/pepper_test_plugin/README @@ -33,10 +33,8 @@ When the Info panel comes up, add these arguments using the '+' button: # Add this to run Chromium as a single process. --single-process -Before you run the executable, copy the plugin into the Chromium.app bundle, -into Chromium.app/Contents/PlugIns. You might have to create the PlugIns -directory first. +Before you run the executable, copy the plugin into ~/Library/Internet Plug-Ins. +You might have to create the directory first. Once all this is set up, you can use "Build and run" (or cmd-r) in Xcode to run the pepper plugin test. - diff --git a/webkit/tools/test_shell/test_shell.gypi b/webkit/tools/test_shell/test_shell.gypi index e27d875..b620db8 100644 --- a/webkit/tools/test_shell/test_shell.gypi +++ b/webkit/tools/test_shell/test_shell.gypi @@ -333,7 +333,7 @@ ], 'copies': [ { - 'destination': '<(PRODUCT_DIR)/TestShell.app/Contents/PlugIns/', + 'destination': '<(PRODUCT_DIR)/plugins/', 'files': [ '<(PRODUCT_DIR)/TestNetscapePlugIn.plugin/', ], |