Add Java support directory to plugin lookup list on 10.5

webkit/plugins/npapi/plugin_list_mac.mm

 // Copyright (c) 2006-2009 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.
 
 #include "webkit/plugins/npapi/plugin_list.h"
 
 #import <Foundation/Foundation.h>
 
 #include "base/file_util.h"
 #include "base/mac/mac_util.h"
@@ skipping 56 matching lines @@
 
 void PluginList::PlatformInit() {
 }
 
 void PluginList::GetPluginDirectories(std::vector<FilePath>* plugin_dirs) {
   // Load from the user's area
   GetPluginCommonDirectory(plugin_dirs, true);
 
   // Load from the machine-wide area
   GetPluginCommonDirectory(plugin_dirs, false);
+
+  // 10.5 includes the Java2 plugin, but no longer has a symlink to it in

[Mark Mentovai, 2011/08/09 16:46:44]

Can you make the comment a bit more specific? This isn’t a property of 10.5 per
se, it’s a property of “Java for Mac OS X 10.5 Update 10.”

You may want to refer directly to
http://developer.apple.com/library/mac/#releasenotes/Java/JavaSnowLeopardUpda...

[stuartmorgan1, 2011/08/10 11:10:44]

Done.

+  // 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/"));

[Mark Mentovai, 2011/08/09 16:46:44]

Any reason for the trailing slash? This works just fine without it.

[stuartmorgan1, 2011/08/10 11:10:44]

Just copy/paste from terminal autocomplete. Removed.

+  }
 }
 
 void PluginList::LoadPluginsFromDir(const FilePath &path,
                                     ScopedVector<PluginGroup>* plugin_groups,
                                     std::set<FilePath>* visited_plugins) {
   file_util::FileEnumerator enumerator(path,
                                        false, // not recursive
                                        file_util::FileEnumerator::DIRECTORIES);
   for (FilePath path = enumerator.Next(); !path.value().empty();
        path = enumerator.Next()) {
@@ skipping 18 matching lines @@
         return false;  // Already have a loaded plugin higher in the hierarchy.
       }
     }
   }
 
   return true;
 }
 
 }  // namespace npapi
 }  // namespace webkit