Browser Plugin: Implement BrowserPluginObserver.

content/renderer/browser_plugin/browser_plugin_manager_impl.cc

Index: content/renderer/browser_plugin/browser_plugin_manager_impl.cc
diff --git a/content/renderer/browser_plugin/browser_plugin_manager_impl.cc b/content/renderer/browser_plugin/browser_plugin_manager_impl.cc
index 55286e459343bad598fee7689c51431c56cc6994..f81e43a84794516f41676bd2c33f174e2065b126 100644
--- a/content/renderer/browser_plugin/browser_plugin_manager_impl.cc
+++ b/content/renderer/browser_plugin/browser_plugin_manager_impl.cc
@@ -5,7 +5,9 @@
 #include "content/renderer/browser_plugin/browser_plugin_manager_impl.h"
 
 #include "content/common/browser_plugin_messages.h"
-#include "content/renderer/browser_plugin/browser_plugin.h"
+#include "content/public/common/content_client.h"
+#include "content/public/renderer/content_renderer_client.h"

[sadrul, 2013/01/09 15:21:54]

These includes aren't used?

[Fady Samuel, 2013/01/09 17:41:24]

Done.

+#include "content/renderer/browser_plugin/browser_plugin_impl.h"
 #include "content/renderer/render_thread_impl.h"
 #include "ui/gfx/point.h"
 #include "webkit/glue/webcursor.h"
@@ -20,14 +22,14 @@ BrowserPluginManagerImpl::BrowserPluginManagerImpl(
 BrowserPluginManagerImpl::~BrowserPluginManagerImpl() {
 }
 
-BrowserPlugin* BrowserPluginManagerImpl::CreateBrowserPlugin(
+BrowserPluginImpl* BrowserPluginManagerImpl::CreateBrowserPlugin(
     RenderViewImpl* render_view,
     WebKit::WebFrame* frame,
     const WebKit::WebPluginParams& params) {
-  return new BrowserPlugin(++browser_plugin_counter_,
-                           render_view,
-                           frame,
-                           params);
+  return new BrowserPluginImpl(++browser_plugin_counter_,
+                               render_view,
+                               frame,
+                               params);
 }
 
 bool BrowserPluginManagerImpl::Send(IPC::Message* msg) {
@@ -42,7 +44,7 @@ bool BrowserPluginManagerImpl::OnMessageReceived(
     PickleIterator iter(message);
     bool success = iter.ReadInt(&instance_id);
     DCHECK(success);
-    BrowserPlugin* plugin = GetBrowserPlugin(instance_id);
+    BrowserPluginImpl* plugin = GetBrowserPlugin(instance_id);
     if (plugin && plugin->OnMessageReceived(message))
       return true;
   }
@@ -61,11 +63,11 @@ void BrowserPluginManagerImpl::OnPluginAtPositionRequest(
     int request_id,
     const gfx::Point& position) {
   int instance_id = -1;
-  IDMap<BrowserPlugin>::iterator it(&instances_);
+  IDMap<BrowserPluginImpl>::iterator it(&instances_);
   gfx::Point local_position = position;
   int source_routing_id = message.routing_id();
   while (!it.IsAtEnd()) {
-    const BrowserPlugin* plugin = it.GetCurrentValue();
+    const BrowserPluginImpl* plugin = it.GetCurrentValue();
     // We need to check the plugin's routing id too since BrowserPluginManager
     // can manage plugins from other embedder (in the same process).
     if (plugin->InBounds(position)) {
@@ -84,28 +86,4 @@ void BrowserPluginManagerImpl::OnPluginAtPositionRequest(
        local_position));
 }
 
-// static
-bool BrowserPluginManagerImpl::ShouldForwardToBrowserPlugin(
-    const IPC::Message& message) {
-  switch (message.type()) {
-    case BrowserPluginMsg_AdvanceFocus::ID:
-    case BrowserPluginMsg_GuestContentWindowReady::ID:
-    case BrowserPluginMsg_GuestGone::ID:
-    case BrowserPluginMsg_GuestResponsive::ID:
-    case BrowserPluginMsg_GuestUnresponsive::ID:
-    case BrowserPluginMsg_LoadAbort::ID:
-    case BrowserPluginMsg_LoadCommit::ID:
-    case BrowserPluginMsg_LoadRedirect::ID:
-    case BrowserPluginMsg_LoadStart::ID:
-    case BrowserPluginMsg_LoadStop::ID:
-    case BrowserPluginMsg_SetCursor::ID:
-    case BrowserPluginMsg_ShouldAcceptTouchEvents::ID:
-    case BrowserPluginMsg_UpdateRect::ID:
-      return true;
-    default:
-      break;
-  }
-  return false;
-}
-
 }  // namespace content