Revert "linux: OOP windowed plugins"

This reverts r19983.  Test failures on Mac and Windows.

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19988 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 34 insertions, 3 deletions

diff --git a/webkit/tools/test_shell/webview_host_gtk.cc b/webkit/tools/test_shell/webview_host_gtk.cc
index 53c42d9..e089052 100644
--- a/webkit/tools/test_shell/webview_host_gtk.cc
+++ b/webkit/tools/test_shell/webview_host_gtk.cc
@@ -20,7 +20,6 @@ WebViewHost* WebViewHost::Create(GtkWidget* parent_view,
   WebViewHost* host = new WebViewHost();
 
   host->view_ = WebWidgetHost::CreateWidget(parent_view, host);
-  host->plugin_container_manager_.set_host_widget(host->view_);
   g_object_set_data(G_OBJECT(host->view_), "webwidgethost", host);
 
   host->webwidget_ = WebView::Create(delegate, prefs);
@@ -34,9 +33,41 @@ WebView* WebViewHost::webview() const {
 }
 
 GdkNativeWindow WebViewHost::CreatePluginContainer() {
-  return plugin_container_manager_.CreatePluginContainer();
+  GtkWidget* plugin_container = gtk_plugin_container_new();
+  g_signal_connect(G_OBJECT(plugin_container), "plug-removed",
+                   G_CALLBACK(OnPlugRemovedThunk), this);
+  gtk_container_add(GTK_CONTAINER(view_handle()), plugin_container);
+  gtk_widget_show(plugin_container);
+  gtk_widget_realize(plugin_container);
+
+  GdkNativeWindow id = gtk_socket_get_id(GTK_SOCKET(plugin_container));
+
+  native_window_to_widget_map_.insert(std::make_pair(id, plugin_container));
+
+  return id;
+}
+
+GtkWidget* WebViewHost::MapIDToWidget(GdkNativeWindow id) {
+  NativeWindowToWidgetMap::const_iterator i =
+      native_window_to_widget_map_.find(id);
+  if (i != native_window_to_widget_map_.end())
+    return i->second;
+
+  LOG(ERROR) << "Request for widget host for unknown window id " << id;
+
+  return NULL;
 }
 
 void WebViewHost::OnPluginWindowDestroyed(GdkNativeWindow id) {
-  plugin_container_manager_.DestroyPluginContainer(id);
+  GtkWidget* plugin_container = MapIDToWidget(id);
+  if (!plugin_container)
+    return;
+
+  native_window_to_widget_map_.erase(id);
+  gtk_widget_destroy(plugin_container);
 }
+
+gboolean WebViewHost::OnPlugRemoved(GtkSocket* socket) {
+  return TRUE;  // Don't destroy our widget; we manage it ourselves.
+}
+