Index: extensions/browser/guest_view/extensions_guest_view_message_filter.cc |
diff --git a/extensions/browser/guest_view/extensions_guest_view_message_filter.cc b/extensions/browser/guest_view/extensions_guest_view_message_filter.cc |
index 7f528400de4e88ac4697b04aaceba3e4d1a3424f..7175e5287b14ad77c3a24c035bb8c23c2a3acb23 100644 |
--- a/extensions/browser/guest_view/extensions_guest_view_message_filter.cc |
+++ b/extensions/browser/guest_view/extensions_guest_view_message_filter.cc |
@@ -45,6 +45,7 @@ void ExtensionsGuestViewMessageFilter::OverrideThreadForMessage( |
const IPC::Message& message, |
BrowserThread::ID* thread) { |
switch (message.type()) { |
+ case ExtensionsGuestViewHostMsg_AttachLocalFrameToGuest::ID: |
case ExtensionsGuestViewHostMsg_CreateMimeHandlerViewGuest::ID: |
case ExtensionsGuestViewHostMsg_ResizeGuest::ID: |
*thread = BrowserThread::UI; |
@@ -64,6 +65,8 @@ bool ExtensionsGuestViewMessageFilter::OnMessageReceived( |
const IPC::Message& message) { |
bool handled = true; |
IPC_BEGIN_MESSAGE_MAP(ExtensionsGuestViewMessageFilter, message) |
+ IPC_MESSAGE_HANDLER(ExtensionsGuestViewHostMsg_AttachLocalFrameToGuest, |
+ OnAttachLocalFrameToGuest) |
IPC_MESSAGE_HANDLER(ExtensionsGuestViewHostMsg_CanExecuteContentScriptSync, |
OnCanExecuteContentScript) |
IPC_MESSAGE_HANDLER(ExtensionsGuestViewHostMsg_CreateMimeHandlerViewGuest, |
@@ -74,6 +77,29 @@ bool ExtensionsGuestViewMessageFilter::OnMessageReceived( |
return handled; |
} |
+void ExtensionsGuestViewMessageFilter::OnAttachLocalFrameToGuest( |
+ int embedder_local_render_frame_id, |
+ int element_instance_id, |
+ int guest_instance_id) { |
+ auto manager = GuestViewManager::FromBrowserContext(browser_context_); |
+ DCHECK(manager); |
+ content::WebContents* guest_web_contents = |
+ manager->GetGuestByInstanceIDHack(guest_instance_id); |
+ DCHECK(guest_web_contents); |
+ auto guest = WebViewGuest::FromWebContents(guest_web_contents); |
+ DCHECK(guest); |
+ content::WebContents* owner_web_contents = guest->owner_web_contents(); |
+ DCHECK(owner_web_contents); |
+ int render_view_proxy_routing_id = |
+ guest_web_contents->AttachLocalFrameToGuest( |
+ owner_web_contents, |
+ render_process_id_, |
+ embedder_local_render_frame_id); |
+ owner_web_contents->GetMainFrame()->Send( |
+ new ExtensionsGuestViewMsg_ContentWindowReady( |
+ element_instance_id, render_view_proxy_routing_id)); |
+} |
+ |
void ExtensionsGuestViewMessageFilter::OnCanExecuteContentScript( |
int render_view_id, |
int script_id, |