diff options
| author | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-10 22:27:43 +0000 |
|---|---|---|
| committer | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-10 22:27:43 +0000 |
| commit | 36fc0fe024293fb50603d73e645c315c3d31536f (patch) | |
| tree | e96afca9c6c625e48641543948999d2c19187123 /webkit | |
| parent | 0ed05451b18dee8458e63ec3e19e2bdfe1ffd6b0 (diff) | |
| download | chromium_src-36fc0fe024293fb50603d73e645c315c3d31536f.zip chromium_src-36fc0fe024293fb50603d73e645c315c3d31536f.tar.gz chromium_src-36fc0fe024293fb50603d73e645c315c3d31536f.tar.bz2 | |
Add Java support directory to plugin lookup list on 10.5
This works around the fact that the Java2 plugin is no longer officially supported for 10.5, and is thus no longer included in the Internet Plug-Ins directories where we expect to find plugins.
BUG=89543
TEST=Open about:plugins on 10.5; Java should be listed.
Review URL: http://codereview.chromium.org/7601022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96224 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/plugins/npapi/plugin_list_mac.mm | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/webkit/plugins/npapi/plugin_list_mac.mm b/webkit/plugins/npapi/plugin_list_mac.mm index 802ea3e..b142b2c 100644 --- a/webkit/plugins/npapi/plugin_list_mac.mm +++ b/webkit/plugins/npapi/plugin_list_mac.mm @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -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, |