Fix some plugin-related NOTIMPLEMENTED()s in gtk Chrome.

We can sneak around not removing the NOTIMPLEMENTED()s completely by
implementing a function halfway -- if a page ends up needing a plugin
we'll get the NOTIMPLEMENTED() again.

With this change I no longer get repeated NOTIMPLEMENTED spew while
running.

Review URL: http://codereview.chromium.org/20264


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

3 files changed, 10 insertions, 20 deletions

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 7c9177f..23b939d 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_gtk.cc
+++ b/chrome/browser/renderer_host/render_widget_host_view_gtk.cc
@@ -160,6 +160,9 @@ gfx::NativeView RenderWidgetHostViewGtk::GetPluginNativeView() {
 
 void RenderWidgetHostViewGtk::MovePluginWindows(
     const std::vector<WebPluginGeometry>& plugin_window_moves) {
+  if (plugin_window_moves.empty())
+    return;
+
   NOTIMPLEMENTED();
 }
 
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index fa0033d..062cde4 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -31,14 +31,18 @@
 #include "chrome/renderer/user_script_slave.h"
 #include "chrome/renderer/visitedlink_slave.h"
 #include "chrome/renderer/webmediaplayer_delegate_impl.h"
+#include "chrome/renderer/webplugin_delegate_proxy.h"
 #include "net/base/escape.h"
 #include "net/base/net_errors.h"
 #include "skia/ext/bitmap_platform_device.h"
 #include "skia/ext/image_operations.h"
+#include "webkit/default_plugin/default_plugin_shared.h"
 #include "webkit/glue/dom_operations.h"
 #include "webkit/glue/dom_serializer.h"
 #include "webkit/glue/glue_accessibility.h"
 #include "webkit/glue/password_form.h"
+#include "webkit/glue/plugins/plugin_list.h"
+#include "webkit/glue/plugins/webplugin_delegate_impl.h"
 #include "webkit/glue/searchable_form_data.h"
 #include "webkit/glue/webdatasource.h"
 #include "webkit/glue/webdropdata.h"
@@ -66,11 +70,7 @@
 #include "chrome/views/message_box_view.h"
 #include "chrome/common/chrome_plugin_lib.h"
 #include "chrome/renderer/chrome_plugin_host.h"
-#include "chrome/renderer/webplugin_delegate_proxy.h"
 #include "skia/ext/vector_canvas.h"
-#include "webkit/default_plugin/default_plugin_shared.h"
-#include "webkit/glue/plugins/plugin_list.h"
-#include "webkit/glue/plugins/webplugin_delegate_impl.h"
 #endif
 
 using base::TimeDelta;
@@ -188,17 +188,12 @@ RenderView::~RenderView() {
     shared_popup_counter_->data--;
 
   resource_dispatcher_->ClearMessageSender();
-#if defined(OS_WIN)
   // Clear any back-pointers that might still be held by plugins.
   PluginDelegateList::iterator it = plugin_delegates_.begin();
   while (it != plugin_delegates_.end()) {
     (*it)->DropRenderView();
     it = plugin_delegates_.erase(it);
   }
-#else
-  // TODO(port): plugins not implemented yet
-  NOTIMPLEMENTED();
-#endif
 
   render_thread_->RemoveFilter(debug_message_handler_);
 
@@ -2627,28 +2622,18 @@ void RenderView::OnSetAltErrorPageURL(const GURL& url) {
 }
 
 void RenderView::DidPaint() {
-#if defined(OS_WIN)
   PluginDelegateList::iterator it = plugin_delegates_.begin();
   while (it != plugin_delegates_.end()) {
     (*it)->FlushGeometryUpdates();
     ++it;
   }
-#else  // defined(OS_WIN)
-  // TODO(port): plugins not yet implemented
-  NOTIMPLEMENTED();
-#endif
 }
 
 void RenderView::OnInstallMissingPlugin() {
-#if defined(OS_WIN)
   // This could happen when the first default plugin is deleted.
   if (first_default_plugin_ == NULL)
     return;
   first_default_plugin_->InstallMissingPlugin();
-#else  // defined(OS_WIN)
-  // TODO(port): plugins not yet implemented
-  NOTIMPLEMENTED();
-#endif
 }
 
 void RenderView::OnFileChooserResponse(
diff --git a/chrome/renderer/webplugin_delegate_proxy.h b/chrome/renderer/webplugin_delegate_proxy.h
index fe5e392..3b7c978 100644
--- a/chrome/renderer/webplugin_delegate_proxy.h
+++ b/chrome/renderer/webplugin_delegate_proxy.h
@@ -8,6 +8,7 @@
 #include <string>
 
 #include "base/gfx/rect.h"
+#include "base/gfx/native_widget_types.h"
 #include "base/ref_counted.h"
 #include "chrome/common/ipc_message.h"
 #include "chrome/renderer/plugin_channel_host.h"
@@ -106,7 +107,8 @@ class WebPluginDelegateProxy : public WebPluginDelegate,
 
   // Message handlers for messages that proxy WebPlugin methods, which
   // we translate into calls to the real WebPlugin.
-  void OnSetWindow(HWND window, HANDLE modal_loop_pump_messages_event);
+  void OnSetWindow(gfx::NativeView window,
+                   HANDLE modal_loop_pump_messages_event);
   void OnCompleteURL(const std::string& url_in, std::string* url_out,
                      bool* result);
   void OnHandleURLRequest(const PluginHostMsg_URLRequest_Params& params);