content/renderer/render_view_impl.cc - Issue 11742017: Allow Plugin placeholders to be shown when plugins are disabled.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/renderer/render_view_impl.cc

Issue 11742017: Allow Plugin placeholders to be shown when plugins are disabled. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase Created 7 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:

Index: content/renderer/render_view_impl.cc

diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc

index 4666171811be133a169cf31da870b7b16c5347fd..de3951f5c7b3403ad96cba3149e227956c73aab5 100644

--- a/content/renderer/render_view_impl.cc

+++ b/content/renderer/render_view_impl.cc

@@ -2505,13 +2505,13 @@ void RenderViewImpl::didActivateCompositor(int input_handler_identifier) {

WebPlugin* RenderViewImpl::createPlugin(WebFrame* frame,

const WebPluginParams& params) {

-#if defined(ENABLE_PLUGINS)

WebPlugin* plugin = NULL;

if (GetContentClient()->renderer()->OverrideCreatePlugin(

this, frame, params, &plugin)) {

return plugin;

}

+#if defined(ENABLE_PLUGINS)

if (UTF16ToASCII(params.mimeType) == kBrowserPluginMimeType) {

return browser_plugin_manager()->CreateBrowserPlugin(this, frame, params);

}