OLD | NEW |
---|---|
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/extension_message_filter.h" | 5 #include "extensions/browser/extension_message_filter.h" |
6 | 6 |
7 #include "components/crx_file/id_util.h" | 7 #include "components/crx_file/id_util.h" |
8 #include "content/public/browser/browser_thread.h" | 8 #include "content/public/browser/browser_thread.h" |
9 #include "content/public/browser/render_frame_host.h" | 9 #include "content/public/browser/render_frame_host.h" |
10 #include "content/public/browser/render_process_host.h" | 10 #include "content/public/browser/render_process_host.h" |
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
186 if (!manager) | 186 if (!manager) |
187 return; | 187 return; |
188 | 188 |
189 content::RenderFrameHost* rfh = | 189 content::RenderFrameHost* rfh = |
190 content::RenderFrameHost::FromID(render_process_id_, render_frame_id); | 190 content::RenderFrameHost::FromID(render_process_id_, render_frame_id); |
191 content::WebContents* embedder_web_contents = | 191 content::WebContents* embedder_web_contents = |
192 content::WebContents::FromRenderFrameHost(rfh); | 192 content::WebContents::FromRenderFrameHost(rfh); |
193 if (!embedder_web_contents) | 193 if (!embedder_web_contents) |
194 return; | 194 return; |
195 | 195 |
196 GuestViewManager::WebContentsCreatedCallback callback = | 196 GuestViewManager::WebContentsCreatedCallback callback = base::Bind( |
197 base::Bind(&ExtensionMessageFilter::MimeHandlerViewGuestCreatedCallback, | 197 &ExtensionMessageFilter::MimeHandlerViewGuestCreatedCallback, this, |
Fady Samuel
2015/01/22 20:42:33
This change seems unnecessary.
paulmeyer
2015/01/23 16:14:30
This was also done by 'git cl format'. I'll change
| |
198 this, | 198 element_instance_id, render_process_id_, render_frame_id, element_size); |
199 element_instance_id, | |
200 render_process_id_, | |
201 render_frame_id, | |
202 element_size); | |
203 | 199 |
204 base::DictionaryValue create_params; | 200 base::DictionaryValue create_params; |
205 create_params.SetString(mime_handler_view::kViewId, view_id); | 201 create_params.SetString(mime_handler_view::kViewId, view_id); |
206 create_params.SetInteger(guestview::kElementWidth, element_size.width()); | 202 create_params.SetInteger(guestview::kElementWidth, element_size.width()); |
207 create_params.SetInteger(guestview::kElementHeight, element_size.height()); | 203 create_params.SetInteger(guestview::kElementHeight, element_size.height()); |
208 manager->CreateGuest(MimeHandlerViewGuest::Type, | 204 manager->CreateGuest(MimeHandlerViewGuest::Type, |
209 embedder_web_contents, | 205 embedder_web_contents, |
210 create_params, | 206 create_params, |
211 callback); | 207 callback); |
212 } | 208 } |
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
320 rfh->GetRenderViewHost()->GetRoutingID(), | 316 rfh->GetRenderViewHost()->GetRoutingID(), |
321 element_instance_id, | 317 element_instance_id, |
322 guest_instance_id, | 318 guest_instance_id, |
323 attach_params); | 319 attach_params); |
324 | 320 |
325 rfh->Send( | 321 rfh->Send( |
326 new ExtensionMsg_CreateMimeHandlerViewGuestACK(element_instance_id)); | 322 new ExtensionMsg_CreateMimeHandlerViewGuestACK(element_instance_id)); |
327 } | 323 } |
328 | 324 |
329 } // namespace extensions | 325 } // namespace extensions |
OLD | NEW |