| Index: chrome/renderer/chrome_content_renderer_client.cc
|
| diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
|
| index c49da3c3b6f7019c901da3b18b7da5b7c6d87969..9346a06f2f6ae792b83fce61e5a4ce00cf81fb6a 100644
|
| --- a/chrome/renderer/chrome_content_renderer_client.cc
|
| +++ b/chrome/renderer/chrome_content_renderer_client.cc
|
| @@ -515,7 +515,9 @@ bool ChromeContentRendererClient::OverrideCreatePlugin(
|
| content::RenderFrame* render_frame,
|
| WebLocalFrame* frame,
|
| const WebPluginParams& params,
|
| + int* instance_id,
|
| WebPlugin** plugin) {
|
| + *instance_id = -1; // kInstanceIDNone.
|
| std::string orig_mime_type = params.mimeType.utf8();
|
| if (orig_mime_type == content::kBrowserPluginMimeType) {
|
| WebDocument document = frame->document();
|
| @@ -539,8 +541,11 @@ bool ChromeContentRendererClient::OverrideCreatePlugin(
|
| render_frame->GetRoutingID(), GURL(params.url),
|
| frame->top()->document().url(), orig_mime_type, &output));
|
|
|
| - if (output.plugin.type == content::WebPluginInfo::PLUGIN_TYPE_BROWSER_PLUGIN)
|
| + if (output.plugin.type ==
|
| + content::WebPluginInfo::PLUGIN_TYPE_BROWSER_PLUGIN) {
|
| + *instance_id = output.instance_id;
|
| return false;
|
| + }
|
| #else
|
| output.status.value = ChromeViewHostMsg_GetPluginInfo_Status::kNotFound;
|
| #endif
|
|
|