diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-02 16:50:58 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-02 16:50:58 +0000 |
| commit | 2290cb86f535d7babd4d84a2a08831404885e78c (patch) | |
| tree | 09bca698a3e1a66c14ff50771dee24cd5751c918 /webkit/glue | |
| parent | e9b3528e6a8d79f465fcdd2e44477f1eb9275539 (diff) | |
| download | chromium_src-2290cb86f535d7babd4d84a2a08831404885e78c.zip chromium_src-2290cb86f535d7babd4d84a2a08831404885e78c.tar.gz chromium_src-2290cb86f535d7babd4d84a2a08831404885e78c.tar.bz2 | |
Make webkit_glue not depend on default_plugin.
This removes a dependency cycle and should also make life easier for DRT.
Revert http://codereview.chromium.org/1658012
Review URL: http://codereview.chromium.org/2358001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48731 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
| -rw-r--r-- | webkit/glue/plugins/plugin_list.cc | 20 | ||||
| -rw-r--r-- | webkit/glue/webkit_glue.gypi | 5 |
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', |