Index: content/renderer/browser_plugin/browser_plugin.cc |
diff --git a/content/renderer/browser_plugin/browser_plugin.cc b/content/renderer/browser_plugin/browser_plugin.cc |
index 1be227deac4342edf795619bd3b5ecf4db3043b1..e723941789dc98476d8c55ffd11d0f0258ca0824 100644 |
--- a/content/renderer/browser_plugin/browser_plugin.cc |
+++ b/content/renderer/browser_plugin/browser_plugin.cc |
@@ -107,8 +107,6 @@ bool BrowserPlugin::OnMessageReceived(const IPC::Message& message) { |
OnCompositorFrameSwapped(message)) |
IPC_MESSAGE_HANDLER(BrowserPluginMsg_CopyFromCompositingSurface, |
OnCopyFromCompositingSurface) |
- IPC_MESSAGE_HANDLER(BrowserPluginMsg_GuestContentWindowReady, |
- OnGuestContentWindowReady) |
IPC_MESSAGE_HANDLER(BrowserPluginMsg_GuestGone, OnGuestGone) |
IPC_MESSAGE_HANDLER(BrowserPluginMsg_SetCursor, OnSetCursor) |
IPC_MESSAGE_HANDLER(BrowserPluginMsg_SetMouseLock, OnSetMouseLock) |
@@ -275,12 +273,6 @@ void BrowserPlugin::OnCopyFromCompositingSurface(int browser_plugin_instance_id, |
dest_size); |
} |
-void BrowserPlugin::OnGuestContentWindowReady(int browser_plugin_instance_id, |
- int content_window_routing_id) { |
- DCHECK(content_window_routing_id != MSG_ROUTING_NONE); |
- content_window_routing_id_ = content_window_routing_id; |
-} |
- |
void BrowserPlugin::OnGuestGone(int browser_plugin_instance_id) { |
guest_crashed_ = true; |
@@ -327,17 +319,6 @@ void BrowserPlugin::OnShouldAcceptTouchEvents(int browser_plugin_instance_id, |
} |
} |
-NPObject* BrowserPlugin::GetContentWindow() const { |
- if (content_window_routing_id_ == MSG_ROUTING_NONE) |
- return NULL; |
- RenderViewImpl* guest_render_view = RenderViewImpl::FromRoutingID( |
- content_window_routing_id_); |
- if (!guest_render_view) |
- return NULL; |
- blink::WebFrame* guest_frame = guest_render_view->GetWebView()->mainFrame(); |
- return guest_frame->windowObject(); |
-} |
- |
void BrowserPlugin::ShowSadGraphic() { |
// If the BrowserPlugin is scheduled to be deleted, then container_ will be |
// NULL so we shouldn't attempt to access it. |
@@ -519,7 +500,6 @@ bool BrowserPlugin::ShouldForwardToBrowserPlugin( |
case BrowserPluginMsg_BuffersSwapped::ID: |
case BrowserPluginMsg_CompositorFrameSwapped::ID: |
case BrowserPluginMsg_CopyFromCompositingSurface::ID: |
- case BrowserPluginMsg_GuestContentWindowReady::ID: |
case BrowserPluginMsg_GuestGone::ID: |
case BrowserPluginMsg_SetCursor::ID: |
case BrowserPluginMsg_SetMouseLock::ID: |