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

Unified Diff: chrome/renderer/chrome_content_renderer_client.cc

Issue 110013007: Fix the !defined(ENABLE_PLUGINS) code path (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 6 years, 12 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 9f9777ebc222c3b21eae6b583307f0e965a6a951..f05ae4224d8f5d346e97a17aada70bbe7b72d212 100644
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -455,11 +455,13 @@ bool ChromeContentRendererClient::OverrideCreatePlugin(
render_frame->Send(new ChromeViewHostMsg_GetPluginInfo(
render_frame->GetRoutingID(), GURL(params.url),
frame->top()->document().url(), orig_mime_type, &output));
+ *plugin = CreatePlugin(render_frame, frame, params, output);
+ return true;
#else
output.status.value = ChromeViewHostMsg_GetPluginInfo_Status::kNotFound;
+ *plugin = NULL;
+ return false;
#endif
- *plugin = CreatePlugin(render_frame, frame, params, output);
- return true;
}
WebPlugin* ChromeContentRendererClient::CreatePluginReplacement(
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698