| Index: Source/modules/plugins/NavigatorPlugins.cpp
|
| diff --git a/Source/modules/plugins/NavigatorPlugins.cpp b/Source/modules/plugins/NavigatorPlugins.cpp
|
| index c86cd06b22d874d121bebd275d05861b495a8cdd..bf48d9cfd8542de4495cae8a3512621bcd0949a7 100644
|
| --- a/Source/modules/plugins/NavigatorPlugins.cpp
|
| +++ b/Source/modules/plugins/NavigatorPlugins.cpp
|
| @@ -60,7 +60,7 @@
|
| // static
|
| bool NavigatorPlugins::javaEnabled(Navigator& navigator)
|
| {
|
| - return false;
|
| + return NavigatorPlugins::from(navigator).javaEnabled(navigator.frame());
|
| }
|
|
|
| DOMPluginArray* NavigatorPlugins::plugins(LocalFrame* frame) const
|
| @@ -77,6 +77,14 @@
|
| return m_mimeTypes.get();
|
| }
|
|
|
| +bool NavigatorPlugins::javaEnabled(LocalFrame* frame) const
|
| +{
|
| + if (!frame || !frame->settings())
|
| + return false;
|
| +
|
| + return frame->settings()->javaEnabled();
|
| +}
|
| +
|
| DEFINE_TRACE(NavigatorPlugins)
|
| {
|
| visitor->trace(m_plugins);
|
|
|