OLD | NEW |
---|---|
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "extensions/browser/guest_view/extensions_guest_view_message_filter.h" | 5 #include "extensions/browser/guest_view/extensions_guest_view_message_filter.h" |
6 | 6 |
7 #include "base/macros.h" | 7 #include "base/macros.h" |
8 #include "components/guest_view/browser/guest_view_base.h" | 8 #include "components/guest_view/browser/guest_view_base.h" |
9 #include "components/guest_view/browser/guest_view_manager.h" | 9 #include "components/guest_view/browser/guest_view_manager.h" |
10 #include "components/guest_view/browser/guest_view_manager_delegate.h" | 10 #include "components/guest_view/browser/guest_view_manager_delegate.h" |
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
162 auto* guest_view = MimeHandlerViewGuest::FromWebContents(web_contents); | 162 auto* guest_view = MimeHandlerViewGuest::FromWebContents(web_contents); |
163 if (!guest_view) | 163 if (!guest_view) |
164 return; | 164 return; |
165 | 165 |
166 int guest_instance_id = guest_view->guest_instance_id(); | 166 int guest_instance_id = guest_view->guest_instance_id(); |
167 auto* rfh = RenderFrameHost::FromID(embedder_render_process_id, | 167 auto* rfh = RenderFrameHost::FromID(embedder_render_process_id, |
168 embedder_render_frame_id); | 168 embedder_render_frame_id); |
169 if (!rfh) | 169 if (!rfh) |
170 return; | 170 return; |
171 | 171 |
172 guest_view->SetEmbedderFrame(embedder_render_process_id, | |
EhsanK
2016/10/20 21:42:38
This happens before attach which was used previous
| |
173 embedder_render_frame_id); | |
174 | |
172 base::DictionaryValue attach_params; | 175 base::DictionaryValue attach_params; |
173 attach_params.SetInteger(guest_view::kElementWidth, element_size.width()); | 176 attach_params.SetInteger(guest_view::kElementWidth, element_size.width()); |
174 attach_params.SetInteger(guest_view::kElementHeight, element_size.height()); | 177 attach_params.SetInteger(guest_view::kElementHeight, element_size.height()); |
175 auto* manager = GuestViewManager::FromBrowserContext(browser_context_); | 178 auto* manager = GuestViewManager::FromBrowserContext(browser_context_); |
176 CHECK(manager); | 179 CHECK(manager); |
177 manager->AttachGuest(embedder_render_process_id, | 180 manager->AttachGuest(embedder_render_process_id, element_instance_id, |
178 element_instance_id, | 181 guest_instance_id, attach_params); |
179 guest_instance_id, | |
180 attach_params); | |
181 | 182 |
182 rfh->Send( | 183 rfh->Send( |
183 new ExtensionsGuestViewMsg_CreateMimeHandlerViewGuestACK( | 184 new ExtensionsGuestViewMsg_CreateMimeHandlerViewGuestACK( |
184 element_instance_id)); | 185 element_instance_id)); |
185 } | 186 } |
186 | 187 |
187 } // namespace extensions | 188 } // namespace extensions |
OLD | NEW |