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, 7 insertions, 22 deletions

diff --git a/chrome/renderer/webplugin_delegate_proxy.cc b/chrome/renderer/webplugin_delegate_proxy.cc
index 37012b8..b98b728 100644
--- a/chrome/renderer/webplugin_delegate_proxy.cc
+++ b/chrome/renderer/webplugin_delegate_proxy.cc
@@ -331,12 +331,6 @@ void WebPluginDelegateProxy::InstallMissingPlugin() {
 void WebPluginDelegateProxy::OnMessageReceived(const IPC::Message& msg) {
   IPC_BEGIN_MESSAGE_MAP(WebPluginDelegateProxy, msg)
     IPC_MESSAGE_HANDLER(PluginHostMsg_SetWindow, OnSetWindow)
-#if defined(OS_LINUX)
-    IPC_MESSAGE_HANDLER(PluginHostMsg_CreatePluginContainer,
-                        OnCreatePluginContainer)
-    IPC_MESSAGE_HANDLER(PluginHostMsg_DestroyPluginContainer,
-                        OnDestroyPluginContainer)
-#endif
 #if defined(OS_WIN)
     IPC_MESSAGE_HANDLER(PluginHostMsg_SetWindowlessPumpEvent,
                         OnSetWindowlessPumpEvent)
@@ -640,25 +634,16 @@ int WebPluginDelegateProxy::GetProcessId() {
   return channel_host_->peer_pid();
 }
 
-void WebPluginDelegateProxy::OnSetWindow(gfx::PluginWindowHandle window) {
-  windowless_ = window != static_cast<gfx::PluginWindowHandle>(0);
+void WebPluginDelegateProxy::OnSetWindow(gfx::NativeViewId window_id) {
+#if defined(OS_WIN)
+  gfx::NativeView window = gfx::NativeViewFromId(window_id);
+  windowless_ = window == NULL;
   if (plugin_)
     plugin_->SetWindow(window);
-}
-
-#if defined(OS_LINUX)
-void WebPluginDelegateProxy::OnCreatePluginContainer(
-    gfx::PluginWindowHandle* container) {
-  RenderThread::current()->Send(new ViewHostMsg_CreatePluginContainer(
-      render_view_->routing_id(), container));
-}
-
-void WebPluginDelegateProxy::OnDestroyPluginContainer(
-    gfx::PluginWindowHandle container) {
-  RenderThread::current()->Send(new ViewHostMsg_DestroyPluginContainer(
-      render_view_->routing_id(), container));
-}
+#else
+  NOTIMPLEMENTED();
 #endif
+}
 
 #if defined(OS_WIN)
   void WebPluginDelegateProxy::OnSetWindowlessPumpEvent(