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/renderer/browser_plugin/browser_plugin.h" | 5 #include "content/renderer/browser_plugin/browser_plugin.h" |
6 | 6 |
7 #include "base/json/json_string_value_serializer.h" | 7 #include "base/json/json_string_value_serializer.h" |
8 #include "base/message_loop.h" | 8 #include "base/message_loop.h" |
9 #include "base/string_number_conversions.h" | 9 #include "base/string_number_conversions.h" |
10 #include "base/string_util.h" | 10 #include "base/string_util.h" |
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
223 // If we haven't created the guest yet, do so now. We will navigate it right | 223 // If we haven't created the guest yet, do so now. We will navigate it right |
224 // after creation. If |src| is empty, we can delay the creation until we | 224 // after creation. If |src| is empty, we can delay the creation until we |
225 // actually need it. | 225 // actually need it. |
226 if (!navigate_src_sent_) { | 226 if (!navigate_src_sent_) { |
227 BrowserPluginHostMsg_CreateGuest_Params create_guest_params; | 227 BrowserPluginHostMsg_CreateGuest_Params create_guest_params; |
228 create_guest_params.storage_partition_id = storage_partition_id_; | 228 create_guest_params.storage_partition_id = storage_partition_id_; |
229 create_guest_params.persist_storage = persist_storage_; | 229 create_guest_params.persist_storage = persist_storage_; |
230 create_guest_params.focused = ShouldGuestBeFocused(); | 230 create_guest_params.focused = ShouldGuestBeFocused(); |
231 create_guest_params.visible = visible_; | 231 create_guest_params.visible = visible_; |
232 create_guest_params.name = name_; | 232 create_guest_params.name = name_; |
| 233 create_guest_params.src = src; |
233 GetDamageBufferWithSizeParams(&create_guest_params.auto_size_params, | 234 GetDamageBufferWithSizeParams(&create_guest_params.auto_size_params, |
234 &create_guest_params.resize_guest_params); | 235 &create_guest_params.resize_guest_params); |
235 browser_plugin_manager()->Send( | 236 browser_plugin_manager()->Send( |
236 new BrowserPluginHostMsg_CreateGuest( | 237 new BrowserPluginHostMsg_CreateGuest( |
237 render_view_routing_id_, | 238 render_view_routing_id_, |
238 instance_id_, | 239 instance_id_, |
239 create_guest_params)); | 240 create_guest_params)); |
240 } | 241 } |
241 | 242 |
242 browser_plugin_manager()->Send( | 243 browser_plugin_manager()->Send( |
(...skipping 852 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1095 void* notify_data) { | 1096 void* notify_data) { |
1096 } | 1097 } |
1097 | 1098 |
1098 void BrowserPlugin::didFailLoadingFrameRequest( | 1099 void BrowserPlugin::didFailLoadingFrameRequest( |
1099 const WebKit::WebURL& url, | 1100 const WebKit::WebURL& url, |
1100 void* notify_data, | 1101 void* notify_data, |
1101 const WebKit::WebURLError& error) { | 1102 const WebKit::WebURLError& error) { |
1102 } | 1103 } |
1103 | 1104 |
1104 } // namespace content | 1105 } // namespace content |
OLD | NEW |