Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1052)

Unified Diff: webkit/plugins/npapi/plugin_list_mac.mm

Issue 7601022: Add Java support directory to plugin lookup list on 10.5 (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Address review comments Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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,
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698