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

Unified Diff: chrome/renderer/plugins/plugin_placeholder.cc

Issue 10951029: Removes PluginInfoMessageFilter dependency on PluginGroup. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: fixed conflict Created 8 years, 3 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
« no previous file with comments | « chrome/renderer/chrome_content_renderer_client.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/plugins/plugin_placeholder.cc
diff --git a/chrome/renderer/plugins/plugin_placeholder.cc b/chrome/renderer/plugins/plugin_placeholder.cc
index af0041b51d37e6a4e58540b182783a515ed289ce..c1b31584537f27c91de16f1cfd38ceaa7378e645 100644
--- a/chrome/renderer/plugins/plugin_placeholder.cc
+++ b/chrome/renderer/plugins/plugin_placeholder.cc
@@ -433,21 +433,19 @@ void PluginPlaceholder::PluginListChanged() {
if (document.isNull())
return;
- ChromeViewHostMsg_GetPluginInfo_Status status;
- webkit::WebPluginInfo plugin_info;
+ ChromeViewHostMsg_GetPluginInfo_Output output;
std::string mime_type(plugin_params_.mimeType.utf8());
- std::string actual_mime_type;
render_view()->Send(new ChromeViewHostMsg_GetPluginInfo(
routing_id(), GURL(plugin_params_.url), document.url(),
- mime_type, &status, &plugin_info, &actual_mime_type));
- if (status.value == status_->value)
+ mime_type, &output));
+
+ if (output.status.value == status_->value)
return;
chrome::ChromeContentRendererClient* client =
static_cast<chrome::ChromeContentRendererClient*>(
content::GetContentClient()->renderer());
WebPlugin* new_plugin =
- client->CreatePlugin(render_view(), frame_, plugin_params_,
- status, plugin_info, actual_mime_type);
+ client->CreatePlugin(render_view(), frame_, plugin_params_, output);
ReplacePlugin(new_plugin);
}
« no previous file with comments | « chrome/renderer/chrome_content_renderer_client.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698