diff options
Diffstat (limited to 'Source/WebKit2/UIProcess/Plugins/unix')
-rw-r--r-- | Source/WebKit2/UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp | 11 | ||||
-rw-r--r-- | Source/WebKit2/UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp | 2 |
2 files changed, 6 insertions, 7 deletions
diff --git a/Source/WebKit2/UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp b/Source/WebKit2/UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp index afaed6d21..d4c9ec2c5 100644 --- a/Source/WebKit2/UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp +++ b/Source/WebKit2/UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp @@ -26,6 +26,9 @@ // Note: this file is only for UNIX. On other platforms we can reuse the native implementation. #include "config.h" + +#if ENABLE(NETSCAPE_PLUGIN_API) + #include "PluginInfoStore.h" #include "NetscapePluginModule.h" @@ -95,13 +98,7 @@ Vector<String> PluginInfoStore::individualPluginPaths() bool PluginInfoStore::getPluginInfo(const String& pluginPath, PluginModuleInfo& plugin) { -#if ENABLE(NETSCAPE_PLUGIN_API) return NetscapePluginModule::getPluginInfo(pluginPath, plugin); -#else - UNUSED_PARAM(pluginPath); - UNUSED_PARAM(plugin); - return false; -#endif } bool PluginInfoStore::shouldUsePlugin(Vector<PluginModuleInfo>& /*alreadyLoadedPlugins*/, const PluginModuleInfo& /*plugin*/) @@ -111,3 +108,5 @@ bool PluginInfoStore::shouldUsePlugin(Vector<PluginModuleInfo>& /*alreadyLoadedP } } // namespace WebKit + +#endif // ENABLE(NETSCAPE_PLUGIN_API) diff --git a/Source/WebKit2/UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp b/Source/WebKit2/UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp index c7a8922e1..64c7bc485 100644 --- a/Source/WebKit2/UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp +++ b/Source/WebKit2/UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp @@ -43,7 +43,7 @@ using namespace WebCore; namespace WebKit { -void PluginProcessProxy::platformInitializeLaunchOptions(ProcessLauncher::LaunchOptions& launchOptions, const PluginModuleInfo& pluginInfo) +void PluginProcessProxy::platformInitializeLaunchOptions(ProcessLauncher::LaunchOptions&, const PluginModuleInfo&) { } |