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

17 files changed, 35 insertions, 173 deletions

diff --git a/chrome/browser/plugin_process_host.cc b/chrome/browser/plugin_process_host.cc
index bfe5ea8..55885bd 100644
--- a/chrome/browser/plugin_process_host.cc
+++ b/chrome/browser/plugin_process_host.cc
@@ -20,7 +20,6 @@
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/file_version_info.h"
-#include "base/gfx/native_widget_types.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
@@ -59,10 +58,6 @@
 #include "chrome/common/ipc_channel_posix.h"
 #endif
 
-#if defined(OS_LINUX)
-#include "base/gfx/gtk_native_view_id_manager.h"
-#endif
-
 static const char kDefaultPluginFinderURL[] =
     "http://dl.google.com/chrome/plugins/plugins2.xml";
 
@@ -293,14 +288,6 @@ void PluginProcessHost::AddWindow(HWND window) {
 
 #endif  // defined(OS_WIN)
 
-#if defined(OS_LINUX)
-void PluginProcessHost::OnMapNativeViewId(gfx::NativeViewId id,
-                                          gfx::PluginWindowHandle* output) {
-  *output = 0;
-  Singleton<GtkNativeViewManager>()->GetXIDForId(output, id);
-}
-#endif  // defined(OS_LINUX)
-
 PluginProcessHost::PluginProcessHost()
     : ChildProcessHost(
           PLUGIN_PROCESS,
@@ -451,10 +438,6 @@ void PluginProcessHost::OnMessageReceived(const IPC::Message& msg) {
                         OnPluginWindowDestroyed)
     IPC_MESSAGE_HANDLER(PluginProcessHostMsg_DownloadUrl, OnDownloadUrl)
 #endif
-#if defined(OS_LINUX)
-    IPC_MESSAGE_HANDLER(PluginProcessHostMsg_MapNativeViewId,
-                        OnMapNativeViewId)
-#endif
     IPC_MESSAGE_UNHANDLED_ERROR()
   IPC_END_MESSAGE_MAP()
 }
diff --git a/chrome/browser/plugin_process_host.h b/chrome/browser/plugin_process_host.h
index 62efdbd..72a5d78 100644
--- a/chrome/browser/plugin_process_host.h
+++ b/chrome/browser/plugin_process_host.h
@@ -110,10 +110,6 @@ class PluginProcessHost : public ChildProcessHost,
                      gfx::NativeWindow caller_window);
 #endif
 
-#if defined(OS_LINUX)
-  void OnMapNativeViewId(gfx::NativeViewId id, gfx::PluginWindowHandle* output);
-#endif
-
   virtual bool CanShutdown() { return sent_requests_.empty(); }
 
   struct ChannelRequest {
diff --git a/chrome/browser/renderer_host/render_view_host.cc b/chrome/browser/renderer_host/render_view_host.cc
index c06d4fa..b7e0ad5 100644
--- a/chrome/browser/renderer_host/render_view_host.cc
+++ b/chrome/browser/renderer_host/render_view_host.cc
@@ -671,10 +671,6 @@ bool RenderViewHost::SuddenTerminationAllowed() const {
 // RenderViewHost, IPC message handlers:
 
 void RenderViewHost::OnMessageReceived(const IPC::Message& msg) {
-#if !defined(OS_LINUX)
-  // On Windows there's a potential deadlock with sync messsages going in
-  // a circle from browser -> plugin -> renderer -> browser.
-  // On Linux we can avoid this by avoiding sync messages from browser->plugin.
   if (msg.is_sync() && !msg.is_caller_pumping_messages()) {
     NOTREACHED() << "Can't send sync messages to UI thread without pumping "
         "messages in the renderer or else deadlocks can occur if the page "
@@ -684,7 +680,6 @@ void RenderViewHost::OnMessageReceived(const IPC::Message& msg) {
     Send(reply);
     return;
   }
-#endif
 
   bool msg_is_ok = true;
   IPC_BEGIN_MESSAGE_MAP_EX(RenderViewHost, msg, msg_is_ok)
diff --git a/chrome/browser/renderer_host/render_widget_host.cc b/chrome/browser/renderer_host/render_widget_host.cc
index 88c8c51..5dec932 100644
--- a/chrome/browser/renderer_host/render_widget_host.cc
+++ b/chrome/browser/renderer_host/render_widget_host.cc
@@ -120,12 +120,6 @@ IPC_DEFINE_MESSAGE_MAP(RenderWidgetHost)
   IPC_MESSAGE_HANDLER(ViewHostMsg_SetCursor, OnMsgSetCursor)
   IPC_MESSAGE_HANDLER(ViewHostMsg_ImeUpdateStatus, OnMsgImeUpdateStatus)
   IPC_MESSAGE_HANDLER_GENERIC(ViewHostMsg_ShowPopup, OnMsgShowPopup(msg))
-#if defined(OS_LINUX)
-  IPC_MESSAGE_HANDLER(ViewHostMsg_CreatePluginContainer,
-                      OnMsgCreatePluginContainer)
-  IPC_MESSAGE_HANDLER(ViewHostMsg_DestroyPluginContainer,
-                      OnMsgDestroyPluginContainer)
-#endif
   IPC_MESSAGE_UNHANDLED_ERROR()
 IPC_END_MESSAGE_MAP()
 
@@ -754,18 +748,6 @@ void RenderWidgetHost::OnMsgShowPopup(const IPC::Message& message) {
 #endif
 }
 
-#if defined(OS_LINUX)
-void RenderWidgetHost::OnMsgCreatePluginContainer(
-    gfx::PluginWindowHandle *container) {
-  *container = view_->CreatePluginContainer();
-}
-
-void RenderWidgetHost::OnMsgDestroyPluginContainer(
-    gfx::PluginWindowHandle container) {
-  view_->DestroyPluginContainer(container);
-}
-#endif
-
 void RenderWidgetHost::PaintBackingStoreRect(TransportDIB* bitmap,
                                              const gfx::Rect& bitmap_rect,
                                              const gfx::Size& view_size) {
diff --git a/chrome/browser/renderer_host/render_widget_host.h b/chrome/browser/renderer_host/render_widget_host.h
index cf3f9d5..c551498 100644
--- a/chrome/browser/renderer_host/render_widget_host.h
+++ b/chrome/browser/renderer_host/render_widget_host.h
@@ -392,10 +392,6 @@ class RenderWidgetHost : public IPC::Channel::Listener {
   // having to bring in render_messages.h in a header file.
   void OnMsgImeUpdateStatus(int control, const gfx::Rect& caret_rect);
   void OnMsgShowPopup(const IPC::Message& message);
-#if defined(OS_LINUX)
-  void OnMsgCreatePluginContainer(gfx::PluginWindowHandle *container);
-  void OnMsgDestroyPluginContainer(gfx::PluginWindowHandle container);
-#endif
 
   // Paints the given bitmap to the current backing store at the given location.
   void PaintBackingStoreRect(TransportDIB* dib,
diff --git a/chrome/browser/renderer_host/render_widget_host_view.h b/chrome/browser/renderer_host/render_widget_host_view.h
index dca077e..2c4a3dc 100644
--- a/chrome/browser/renderer_host/render_widget_host_view.h
+++ b/chrome/browser/renderer_host/render_widget_host_view.h
@@ -151,11 +151,6 @@ class RenderWidgetHostView {
                                   const std::vector<WebMenuItem>& items) = 0;
 #endif
 
-#if defined(OS_LINUX)
-  virtual gfx::PluginWindowHandle CreatePluginContainer() = 0;
-  virtual void DestroyPluginContainer(gfx::PluginWindowHandle container) = 0;
-#endif
-
   void set_activatable(bool activatable) {
     activatable_ = activatable;
   }
diff --git a/chrome/browser/renderer_host/render_widget_host_view_gtk.cc b/chrome/browser/renderer_host/render_widget_host_view_gtk.cc
index 29d7275..1da195f 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_gtk.cc
+++ b/chrome/browser/renderer_host/render_widget_host_view_gtk.cc
@@ -34,8 +34,7 @@ using WebKit::WebInputEventFactory;
 class RenderWidgetHostViewGtkWidget {
  public:
   static GtkWidget* CreateNewWidget(RenderWidgetHostViewGtk* host_view) {
-    GtkWidget* widget = gtk_fixed_new();
-    gtk_fixed_set_has_window(GTK_FIXED(widget), TRUE);
+    GtkWidget* widget = gtk_drawing_area_new();
     gtk_widget_set_double_buffered(widget, FALSE);
 #if defined(NDEBUG)
     gtk_widget_modify_bg(widget, GTK_STATE_NORMAL, &gfx::kGdkWhite);
@@ -376,7 +375,6 @@ RenderWidgetHostViewGtk::~RenderWidgetHostViewGtk() {
 
 void RenderWidgetHostViewGtk::InitAsChild() {
   view_.Own(RenderWidgetHostViewGtkWidget::CreateNewWidget(this));
-  plugin_container_manager_.set_host_widget(view_.get());
   gtk_widget_show(view_.get());
 }
 
@@ -386,7 +384,6 @@ void RenderWidgetHostViewGtk::InitAsPopup(
   parent_ = parent_host_view->GetNativeView();
   GtkWidget* popup = gtk_window_new(GTK_WINDOW_POPUP);
   view_.Own(RenderWidgetHostViewGtkWidget::CreateNewWidget(this));
-  plugin_container_manager_.set_host_widget(view_.get());
   gtk_container_add(GTK_CONTAINER(popup), view_.get());
 
   // If we are not activatable, we don't want to grab keyboard input,
@@ -474,9 +471,10 @@ gfx::NativeView RenderWidgetHostViewGtk::GetNativeView() {
 
 void RenderWidgetHostViewGtk::MovePluginWindows(
     const std::vector<WebPluginGeometry>& plugin_window_moves) {
-  for (size_t i = 0; i < plugin_window_moves.size(); ++i) {
-    plugin_container_manager_.MovePluginContainer(plugin_window_moves[i]);
-  }
+  if (plugin_window_moves.empty())
+    return;
+
+  NOTIMPLEMENTED();
 }
 
 void RenderWidgetHostViewGtk::Focus() {
@@ -575,7 +573,6 @@ void RenderWidgetHostViewGtk::DidScrollRect(const gfx::Rect& rect, int dx,
 
 void RenderWidgetHostViewGtk::RenderViewGone() {
   Destroy();
-  plugin_container_manager_.set_host_widget(NULL);
 }
 
 void RenderWidgetHostViewGtk::Destroy() {
@@ -710,12 +707,3 @@ void RenderWidgetHostViewGtk::ReceivedSelectionText(GtkClipboard* clipboard,
   host_view->host_->Send(new ViewMsg_InsertText(host_view->host_->routing_id(),
                                                 UTF8ToUTF16(text)));
 }
-
-gfx::PluginWindowHandle RenderWidgetHostViewGtk::CreatePluginContainer() {
-  return plugin_container_manager_.CreatePluginContainer();
-}
-
-void RenderWidgetHostViewGtk::DestroyPluginContainer(
-    gfx::PluginWindowHandle container) {
-  plugin_container_manager_.DestroyPluginContainer(container);
-}
diff --git a/chrome/browser/renderer_host/render_widget_host_view_gtk.h b/chrome/browser/renderer_host/render_widget_host_view_gtk.h
index 1caa1ac..3df3006 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_gtk.h
+++ b/chrome/browser/renderer_host/render_widget_host_view_gtk.h
@@ -12,7 +12,6 @@
 #include "chrome/browser/renderer_host/render_widget_host_view.h"
 #include "chrome/common/owned_widget_gtk.h"
 #include "chrome/common/render_messages.h"
-#include "webkit/glue/plugins/gtk_plugin_container_manager.h"
 #include "webkit/glue/webcursor.h"
 
 class RenderWidgetHost;
@@ -60,8 +59,6 @@ class RenderWidgetHostViewGtk : public RenderWidgetHostView {
   virtual void PasteFromSelectionClipboard();
   virtual void ShowingContextMenu(bool showing);
   virtual BackingStore* AllocBackingStore(const gfx::Size& size);
-  virtual gfx::PluginWindowHandle CreatePluginContainer();
-  virtual void DestroyPluginContainer(gfx::PluginWindowHandle container);
 
   gfx::NativeView native_view() const { return view_.get(); }
 
@@ -140,9 +137,6 @@ class RenderWidgetHostViewGtk : public RenderWidgetHostView {
   // This state is used when GtkIMContext signal handlers create Char events
   // because they don't use the GdkEventKey objects and cannot get the state.
   int im_modifier_state_;
-
-  // Helper class that lets us allocate plugin containers and move them.
-  GtkPluginContainerManager plugin_container_manager_;
 };
 
 #endif  // CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_GTK_H_
diff --git a/chrome/browser/renderer_host/test/test_render_view_host.h b/chrome/browser/renderer_host/test/test_render_view_host.h
index 0b16181..d87ce14 100644
--- a/chrome/browser/renderer_host/test/test_render_view_host.h
+++ b/chrome/browser/renderer_host/test/test_render_view_host.h
@@ -79,11 +79,6 @@ class TestRenderWidgetHostView : public RenderWidgetHostView {
                                   const std::vector<WebMenuItem>& items) {}
 #endif
 
-#if defined(OS_LINUX)
-  virtual gfx::PluginWindowHandle CreatePluginContainer() { return 0; }
-  virtual void DestroyPluginContainer(gfx::PluginWindowHandle container) { }
-#endif
-
   bool is_showing() const { return is_showing_; }
 
  private:
diff --git a/chrome/common/plugin_messages_internal.h b/chrome/common/plugin_messages_internal.h
index dc853c2..9eed897 100644
--- a/chrome/common/plugin_messages_internal.h
+++ b/chrome/common/plugin_messages_internal.h
@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/gfx/native_widget_types.h"
 #include "base/shared_memory.h"
 #include "build/build_config.h"
 #include "chrome/common/ipc_message_macros.h"
@@ -98,16 +97,6 @@ IPC_BEGIN_MESSAGES(PluginProcessHost)
                       HWND /* caller window */)
 #endif
 
-#if defined(OS_LINUX)
-  // On Linux, the mapping between NativeViewId and X window ids
-  // is known only to the browser.  This message lets the plugin process
-  // ask about a NativeViewId that was provided by the renderer.
-  // It will get 0 back if it's a bogus input.
-  IPC_SYNC_MESSAGE_CONTROL1_1(PluginProcessHostMsg_MapNativeViewId,
-                             gfx::NativeViewId /* input: native view id */,
-                             gfx::PluginWindowHandle /* output: X window id */)
-#endif
-
 IPC_END_MESSAGES(PluginProcessHost)
 
 
@@ -230,16 +219,7 @@ IPC_BEGIN_MESSAGES(PluginHost)
   // The window parameter is a handle to the window if the plugin is a windowed
   // plugin. It is NULL for windowless plugins.
   IPC_SYNC_MESSAGE_ROUTED1_0(PluginHostMsg_SetWindow,
-                             gfx::PluginWindowHandle /* window */)
-
-#if defined(OS_LINUX)
-  // Asks the renderer to create a plugin container (GtkSocket).
-  IPC_SYNC_MESSAGE_ROUTED0_1(PluginHostMsg_CreatePluginContainer,
-                             gfx::PluginWindowHandle /* container */)
-  // Asks the renderer to destroy a plugin container (GtkSocket).
-  IPC_SYNC_MESSAGE_ROUTED1_0(PluginHostMsg_DestroyPluginContainer,
-                             gfx::PluginWindowHandle /* container */)
-#endif
+                             gfx::NativeViewId /* window */)
 
 #if defined(OS_WIN)
   // The modal_loop_pump_messages_event parameter is an event handle which is
diff --git a/chrome/common/render_messages_internal.h b/chrome/common/render_messages_internal.h
index d6ff653..d04c3a5 100644
--- a/chrome/common/render_messages_internal.h
+++ b/chrome/common/render_messages_internal.h
@@ -929,13 +929,6 @@ IPC_BEGIN_MESSAGES(ViewHost)
                               IPC::ChannelHandle /* handle to channel */,
                               FilePath /* plugin_path */)
 
-#if defined(OS_LINUX)
-  IPC_SYNC_MESSAGE_ROUTED0_1(ViewHostMsg_CreatePluginContainer,
-                             gfx::PluginWindowHandle /* container */)
-  IPC_SYNC_MESSAGE_ROUTED1_0(ViewHostMsg_DestroyPluginContainer,
-                             gfx::PluginWindowHandle /* container */)
-#endif
-
   // Clipboard IPC messages
 
   // This message is used when the object list does not contain a bitmap.
diff --git a/chrome/plugin/plugin_main.cc b/chrome/plugin/plugin_main.cc
index a710b70..fb8880f 100644
--- a/chrome/plugin/plugin_main.cc
+++ b/chrome/plugin/plugin_main.cc
@@ -67,22 +67,6 @@ int PluginMain(const MainFunctionParams& parameters) {
                          MB_OK | MB_SETFOREGROUND);
   }
 #else
-#if defined(OS_LINUX)
-  {
-    // XEmbed plugins assume they are hosted in a Gtk application, so we need
-    // to initialize Gtk in the plugin process.
-    // TODO(evanm): hoist this up nearer to where we have argc/argv.
-    const std::vector<std::string>& args = parameters.command_line_.argv();
-    int argc = args.size();
-    scoped_array<const char *> argv(new const char *[argc + 1]);
-    for (int i = 0; i < argc; ++i) {
-      argv[i] = args[i].c_str();
-    }
-    argv[argc] = NULL;
-    const char **argv_pointer = argv.get();
-    gtk_init(&argc, const_cast<char***>(&argv_pointer));
-  }
-#endif
   NOTIMPLEMENTED() << " non-windows startup, plugin startup dialog etc.";
 #endif
 
diff --git a/chrome/plugin/webplugin_delegate_stub.cc b/chrome/plugin/webplugin_delegate_stub.cc
index 3bfd002..e607667 100644
--- a/chrome/plugin/webplugin_delegate_stub.cc
+++ b/chrome/plugin/webplugin_delegate_stub.cc
@@ -128,15 +128,14 @@ void WebPluginDelegateStub::OnInit(const PluginMsg_Init_Params& params,
   FilePath path = FilePath::FromWStringHack(
       command_line.GetSwitchValue(switches::kPluginPath));
 
-
-  gfx::PluginWindowHandle parent = NULL;
 #if defined(OS_WIN)
-  parent = gfx::NativeViewFromId(params.containing_window);
-#elif defined(OS_LINUX)
-  PluginThread::current()->Send(new PluginProcessHostMsg_MapNativeViewId(
-      params.containing_window, &parent));
+  delegate_ = WebPluginDelegate::Create(
+      path, mime_type_, gfx::NativeViewFromId(params.containing_window));
+#else
+  NOTIMPLEMENTED() << " need to figure out nativeview id business";
+  delegate_ = WebPluginDelegate::Create(
+      path, mime_type_, NULL);
 #endif
-  delegate_ = WebPluginDelegate::Create(path, mime_type_, parent);
 
   if (delegate_) {
     webplugin_ = new WebPluginProxy(channel_, instance_id_, delegate_);
diff --git a/chrome/plugin/webplugin_proxy.cc b/chrome/plugin/webplugin_proxy.cc
index 3d6a6ac..57c07fc 100644
--- a/chrome/plugin/webplugin_proxy.cc
+++ b/chrome/plugin/webplugin_proxy.cc
@@ -56,16 +56,12 @@ bool WebPluginProxy::Send(IPC::Message* msg) {
   return channel_->Send(msg);
 }
 
-#if defined(OS_LINUX)
-gfx::PluginWindowHandle WebPluginProxy::CreatePluginContainer() {
-  gfx::PluginWindowHandle container;
-  Send(new PluginHostMsg_CreatePluginContainer(route_id_, &container));
-  return container;
-}
-#endif
-
 void WebPluginProxy::SetWindow(gfx::PluginWindowHandle window) {
-  Send(new PluginHostMsg_SetWindow(route_id_, window));
+#if defined(OS_WIN)
+  Send(new PluginHostMsg_SetWindow(route_id_, gfx::IdFromNativeView(window)));
+#else
+  NOTIMPLEMENTED();
+#endif
 }
 
 void WebPluginProxy::WillDestroyWindow(gfx::PluginWindowHandle window) {
@@ -73,8 +69,6 @@ void WebPluginProxy::WillDestroyWindow(gfx::PluginWindowHandle window) {
   PluginThread::current()->Send(
       new PluginProcessHostMsg_PluginWindowDestroyed(
           window, ::GetParent(window)));
-#elif defined(OS_LINUX)
-  Send(new PluginHostMsg_DestroyPluginContainer(route_id_, window));
 #else
   NOTIMPLEMENTED();
 #endif
@@ -281,6 +275,7 @@ void WebPluginProxy::HandleURLRequest(const char *method,
   if (!target && (0 == base::strcasecmp(method, "GET"))) {
     // Please refer to https://bugzilla.mozilla.org/show_bug.cgi?id=366082
     // for more details on this.
+#if defined(OS_WIN)
     if (delegate_->GetQuirks() &
         WebPluginDelegate::PLUGIN_QUIRK_BLOCK_NONSTANDARD_GETURL_REQUESTS) {
       GURL request_url(url);
@@ -290,6 +285,10 @@ void WebPluginProxy::HandleURLRequest(const char *method,
         return;
       }
     }
+#else
+    // TODO(port): we need a GetQuirks() on our delegate impl.
+    NOTIMPLEMENTED();
+#endif
   }
 
   PluginHostMsg_URLRequest_Params params;
@@ -403,6 +402,7 @@ void WebPluginProxy::UpdateGeometry(
     const gfx::Rect& clip_rect,
     const TransportDIB::Id& windowless_buffer_id,
     const TransportDIB::Id& background_buffer_id) {
+#if defined(OS_WIN)
   // TODO(port): this isn't correct usage of a TransportDIB; for now,
   // the caller temporarly just stuffs the handle into the HANDLE
   // field of the TransportDIB::Id so it should behave like the older
@@ -410,9 +410,8 @@ void WebPluginProxy::UpdateGeometry(
   gfx::Rect old = delegate_->GetRect();
   gfx::Rect old_clip_rect = delegate_->GetClipRect();
 
-  delegate_->UpdateGeometry(window_rect, clip_rect);
-#if defined(OS_WIN)
   bool moved = old.x() != window_rect.x() || old.y() != window_rect.y();
+  delegate_->UpdateGeometry(window_rect, clip_rect);
   if (windowless_buffer_id.handle) {
     // The plugin's rect changed, so now we have a new buffer to draw into.
     SetWindowlessBuffer(windowless_buffer_id.handle,
diff --git a/chrome/plugin/webplugin_proxy.h b/chrome/plugin/webplugin_proxy.h
index 0388514..c7bbe91 100644
--- a/chrome/plugin/webplugin_proxy.h
+++ b/chrome/plugin/webplugin_proxy.h
@@ -38,7 +38,9 @@ class WebPluginProxy : public WebPlugin {
 
   // WebPlugin overrides
 #if defined(OS_LINUX)
-  gfx::PluginWindowHandle CreatePluginContainer();
+  gfx::PluginWindowHandle CreatePluginContainer() {
+    return 0;  // Temporary empty stub while we restructure test_shell.
+  }
 #endif
   void SetWindow(gfx::PluginWindowHandle window);
   void WillDestroyWindow(gfx::PluginWindowHandle window);
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(
diff --git a/chrome/renderer/webplugin_delegate_proxy.h b/chrome/renderer/webplugin_delegate_proxy.h
index e720815..3b8d616 100644
--- a/chrome/renderer/webplugin_delegate_proxy.h
+++ b/chrome/renderer/webplugin_delegate_proxy.h
@@ -106,11 +106,7 @@ class WebPluginDelegateProxy : public WebPluginDelegate,
 
   // Message handlers for messages that proxy WebPlugin methods, which
   // we translate into calls to the real WebPlugin.
-  void OnSetWindow(gfx::PluginWindowHandle window);
-#if defined(OS_LINUX)
-  void OnCreatePluginContainer(gfx::PluginWindowHandle* container);
-  void OnDestroyPluginContainer(gfx::PluginWindowHandle container);
-#endif
+  void OnSetWindow(gfx::NativeViewId window);
 #if defined(OS_WIN)
   void OnSetWindowlessPumpEvent(HANDLE modal_loop_pump_messages_event);
 #endif