| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/browser/browser_plugin/old/browser_plugin_host.h" | 5 #include "content/browser/browser_plugin/old/browser_plugin_host.h" |
| 6 | 6 |
| 7 #include "content/browser/browser_plugin/old/browser_plugin_host_helper.h" | 7 #include "content/browser/browser_plugin/old/browser_plugin_host_helper.h" |
| 8 #include "content/browser/renderer_host/render_view_host_impl.h" | 8 #include "content/browser/renderer_host/render_view_host_impl.h" |
| 9 #include "content/browser/web_contents/web_contents_impl.h" | 9 #include "content/browser/web_contents/web_contents_impl.h" |
| 10 #include "content/common/browser_plugin_messages.h" | 10 #include "content/common/old_browser_plugin_messages.h" |
| 11 #include "content/public/common/url_constants.h" | 11 #include "content/public/common/url_constants.h" |
| 12 #include "content/public/browser/notification_details.h" | 12 #include "content/public/browser/notification_details.h" |
| 13 #include "content/public/browser/notification_source.h" | 13 #include "content/public/browser/notification_source.h" |
| 14 #include "content/public/browser/notification_types.h" | 14 #include "content/public/browser/notification_types.h" |
| 15 #include "content/public/browser/render_process_host.h" | 15 #include "content/public/browser/render_process_host.h" |
| 16 #include "content/public/browser/render_widget_host_view.h" | 16 #include "content/public/browser/render_widget_host_view.h" |
| 17 #include "content/public/browser/site_instance.h" | 17 #include "content/public/browser/site_instance.h" |
| 18 #include "content/public/browser/web_contents_view.h" | 18 #include "content/public/browser/web_contents_view.h" |
| 19 #include "ppapi/proxy/ppapi_messages.h" | 19 #include "ppapi/proxy/ppapi_messages.h" |
| 20 | 20 |
| (...skipping 30 matching lines...) Expand all Loading... |
| 51 void BrowserPluginHost::RegisterContainerInstance( | 51 void BrowserPluginHost::RegisterContainerInstance( |
| 52 int container_id, | 52 int container_id, |
| 53 BrowserPluginHost* observer) { | 53 BrowserPluginHost* observer) { |
| 54 DCHECK(guests_by_container_id_.find(container_id) == | 54 DCHECK(guests_by_container_id_.find(container_id) == |
| 55 guests_by_container_id_.end()); | 55 guests_by_container_id_.end()); |
| 56 guests_by_container_id_[container_id] = observer; | 56 guests_by_container_id_[container_id] = observer; |
| 57 } | 57 } |
| 58 | 58 |
| 59 bool BrowserPluginHost::TakeFocus(bool reverse) { | 59 bool BrowserPluginHost::TakeFocus(bool reverse) { |
| 60 embedder_render_process_host()->Send( | 60 embedder_render_process_host()->Send( |
| 61 new BrowserPluginMsg_AdvanceFocus(instance_id(), reverse)); | 61 new OldBrowserPluginMsg_AdvanceFocus(instance_id(), reverse)); |
| 62 return true; | 62 return true; |
| 63 } | 63 } |
| 64 | 64 |
| 65 bool BrowserPluginHost::OnMessageReceived(const IPC::Message& message) { | 65 bool BrowserPluginHost::OnMessageReceived(const IPC::Message& message) { |
| 66 bool handled = true; | 66 bool handled = true; |
| 67 IPC_BEGIN_MESSAGE_MAP(BrowserPluginHost, message) | 67 IPC_BEGIN_MESSAGE_MAP(BrowserPluginHost, message) |
| 68 IPC_MESSAGE_HANDLER(BrowserPluginHostMsg_NavigateFromGuest, | 68 IPC_MESSAGE_HANDLER(OldBrowserPluginHostMsg_NavigateFromGuest, |
| 69 OnNavigateFromGuest) | 69 OnNavigateFromGuest) |
| 70 IPC_MESSAGE_UNHANDLED(handled = false) | 70 IPC_MESSAGE_UNHANDLED(handled = false) |
| 71 IPC_END_MESSAGE_MAP() | 71 IPC_END_MESSAGE_MAP() |
| 72 return handled; | 72 return handled; |
| 73 } | 73 } |
| 74 | 74 |
| 75 void BrowserPluginHost::NavigateGuestFromEmbedder( | 75 void BrowserPluginHost::NavigateGuestFromEmbedder( |
| 76 RenderViewHost* render_view_host, | 76 RenderViewHost* render_view_host, |
| 77 int container_instance_id, | 77 int container_instance_id, |
| 78 long long frame_id, | 78 long long frame_id, |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 130 std::string()); | 130 std::string()); |
| 131 } | 131 } |
| 132 | 132 |
| 133 void BrowserPluginHost::ConnectEmbedderToChannel( | 133 void BrowserPluginHost::ConnectEmbedderToChannel( |
| 134 RenderViewHost* render_view_host, | 134 RenderViewHost* render_view_host, |
| 135 const IPC::ChannelHandle& channel_handle) { | 135 const IPC::ChannelHandle& channel_handle) { |
| 136 DCHECK(embedder_render_process_host()); | 136 DCHECK(embedder_render_process_host()); |
| 137 // Tell the BrowserPlugin in the embedder that we're done and that it can | 137 // Tell the BrowserPlugin in the embedder that we're done and that it can |
| 138 // begin using the guest renderer. | 138 // begin using the guest renderer. |
| 139 embedder_render_process_host()->Send( | 139 embedder_render_process_host()->Send( |
| 140 new BrowserPluginMsg_LoadGuest( | 140 new OldBrowserPluginMsg_LoadGuest( |
| 141 instance_id(), | 141 instance_id(), |
| 142 render_view_host->GetProcess()-> | 142 render_view_host->GetProcess()-> |
| 143 GetID(), | 143 GetID(), |
| 144 channel_handle)); | 144 channel_handle)); |
| 145 } | 145 } |
| 146 | 146 |
| 147 void BrowserPluginHost::AddGuest(WebContentsImpl* guest, int64 frame_id) { | 147 void BrowserPluginHost::AddGuest(WebContentsImpl* guest, int64 frame_id) { |
| 148 guests_[guest] = frame_id; | 148 guests_[guest] = frame_id; |
| 149 } | 149 } |
| 150 | 150 |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 228 web_contents->WasHidden(); | 228 web_contents->WasHidden(); |
| 229 } | 229 } |
| 230 break; | 230 break; |
| 231 } | 231 } |
| 232 default: | 232 default: |
| 233 NOTREACHED() << "Unexpected notification type: " << type; | 233 NOTREACHED() << "Unexpected notification type: " << type; |
| 234 } | 234 } |
| 235 } | 235 } |
| 236 | 236 |
| 237 } // namespace content | 237 } // namespace content |
| OLD | NEW |