Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1739)

Unified Diff: components/guest_view/browser/guest_view_message_filter.cc

Issue 2417693002: Allow MimeHandlerViewGuest be embedded inside OOPIFs (Closed)
Patch Set: Added a NOTREACHED Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/guest_view/browser/guest_view_message_filter.cc
diff --git a/components/guest_view/browser/guest_view_message_filter.cc b/components/guest_view/browser/guest_view_message_filter.cc
index bb17ea69d4abe3c977883d56dfe2b5e8474a5e13..8618e27a99eed70bc45f4ef21531638118d524af 100644
--- a/components/guest_view/browser/guest_view_message_filter.cc
+++ b/components/guest_view/browser/guest_view_message_filter.cc
@@ -100,6 +100,7 @@ void GuestViewMessageFilter::OnViewGarbageCollected(int view_instance_id) {
void GuestViewMessageFilter::OnAttachGuest(
int element_instance_id,
int guest_instance_id,
+ int embedder_routing_id,
const base::DictionaryValue& params) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
auto* manager = GuestViewManager::FromBrowserContext(browser_context_);
@@ -108,10 +109,8 @@ void GuestViewMessageFilter::OnAttachGuest(
if (!manager)
return;
- manager->AttachGuest(render_process_id_,
- element_instance_id,
- guest_instance_id,
- params);
+ manager->AttachGuest(render_process_id_, embedder_routing_id,
+ element_instance_id, guest_instance_id, params);
}
void GuestViewMessageFilter::OnAttachToEmbedderFrame(
@@ -142,8 +141,8 @@ void GuestViewMessageFilter::OnAttachToEmbedderFrame(
// Update the guest manager about the attachment.
// This sets up the embedder and guest pairing information inside
// the manager.
- manager->AttachGuest(render_process_id_, element_instance_id,
- guest_instance_id, params);
+ manager->AttachGuest(render_process_id_, embedder_local_render_frame_id,
+ element_instance_id, guest_instance_id, params);
owner_web_contents->GetMainFrame()->Send(
new GuestViewMsg_AttachToEmbedderFrame_ACK(element_instance_id));

Powered by Google App Engine
This is Rietveld 408576698