From 2290cb86f535d7babd4d84a2a08831404885e78c Mon Sep 17 00:00:00 2001
From: "thakis@chromium.org"
 <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Wed, 2 Jun 2010 16:50:58 +0000
Subject: 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
---
 webkit/glue/plugins/plugin_list.cc | 20 --------------------
 webkit/glue/webkit_glue.gypi       |  5 -----
 2 files changed, 25 deletions(-)

(limited to 'webkit/glue')

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',
-- 
cgit v1.1