summaryrefslogtreecommitdiffstats
path: root/webkit/glue
diff options
context:
space:
mode:
Diffstat (limited to 'webkit/glue')
-rw-r--r--webkit/glue/plugins/plugin_list.cc20
-rw-r--r--webkit/glue/webkit_glue.gypi5
2 files changed, 0 insertions, 25 deletions
diff --git a/webkit/glue/plugins/plugin_list.cc b/webkit/glue/plugins/plugin_list.cc
index d8651d7..487420f 100644
--- a/webkit/glue/plugins/plugin_list.cc
+++ b/webkit/glue/plugins/plugin_list.cc
@@ -12,7 +12,6 @@
#include "base/utf_string_conversions.h"
#include "base/time.h"
#include "net/base/mime_util.h"
-#include "webkit/default_plugin/plugin_main.h"
#include "webkit/glue/plugins/plugin_constants_win.h"
#include "webkit/glue/plugins/plugin_lib.h"
#include "webkit/glue/webkit_glue.h"
@@ -140,25 +139,6 @@ bool PluginList::CreateWebPluginInfo(const PluginVersionInfo& pvi,
PluginList::PluginList()
: plugins_loaded_(false), plugins_need_refresh_(false) {
PlatformInit();
-
- const PluginVersionInfo default_plugin = {
- FilePath(kDefaultPluginLibraryName),
- L"Default Plug-in",
- L"Provides functionality for installing third-party plug-ins",
- L"1",
- L"*",
- L"",
- L"",
- {
-#if !defined(OS_POSIX) || defined(OS_MACOSX)
- default_plugin::NP_GetEntryPoints,
-#endif
- default_plugin::NP_Initialize,
- default_plugin::NP_Shutdown
- }
- };
-
- internal_plugins_.push_back(default_plugin);
}
void PluginList::LoadPlugins(bool refresh) {
diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi
index 8adcbf5..83b2a9b 100644
--- a/webkit/glue/webkit_glue.gypi
+++ b/webkit/glue/webkit_glue.gypi
@@ -366,11 +366,6 @@
'plugins/plugin_stubs.cc',
],
}],
- ['inside_chromium_build==1 or OS!="win"', {
- 'dependencies': [
- '<(DEPTH)/webkit/default_plugin/default_plugin.gyp:default_plugin',
- ],
- }],
['inside_chromium_build==0', {
'dependencies': [
'<(DEPTH)/webkit/support/setup_third_party.gyp:third_party_headers',