| Index: webkit/plugins/npapi/plugin_list_mac.mm
|
| diff --git a/webkit/plugins/npapi/plugin_list_mac.mm b/webkit/plugins/npapi/plugin_list_mac.mm
|
| index 802ea3e5e077a20006e3cd4522eb25a451cb1974..822957e3e7eeed239b967ba2fb694787b2146c77 100644
|
| --- a/webkit/plugins/npapi/plugin_list_mac.mm
|
| +++ b/webkit/plugins/npapi/plugin_list_mac.mm
|
| @@ -74,6 +74,14 @@ void PluginList::GetPluginDirectories(std::vector<FilePath>* plugin_dirs) {
|
|
|
| // Load from the machine-wide area
|
| GetPluginCommonDirectory(plugin_dirs, false);
|
| +
|
| + // 10.5 includes the Java2 plugin, but as of Java for Mac OS X 10.5 Update 10
|
| + // no longer has a symlink to it in the Internet Plug-Ins directory.
|
| + // Manually include it since there's no other way to support Java.
|
| + if (base::mac::IsOSLeopard()) {
|
| + plugin_dirs->push_back(FilePath(
|
| + "/System/Library/Java/Support/Deploy.bundle/Contents/Resources"));
|
| + }
|
| }
|
|
|
| void PluginList::LoadPluginsFromDir(const FilePath &path,
|
|
|