chrome/renderer/render_view.cc - Issue 5699005: Policy: Re-enabled plugin still 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: chrome/renderer/render_view.cc

Issue 5699005: Policy: Re-enabled plugin still disabled (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Whitespace fixes only. Trybot happiness still applies. Created 9 years, 11 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: chrome/renderer/render_view.cc

diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc

index d8adaaa5279182cfccf03a98883ea44e374f7c3f..3e32e3b3152837ff4797901f9ba4442f50663175 100644

--- a/chrome/renderer/render_view.cc

+++ b/chrome/renderer/render_view.cc

@@ -920,7 +920,7 @@ WebPlugin* RenderView::CreatePluginNoCheck(WebFrame* frame,

Send(new ViewHostMsg_GetPluginInfo(

routing_id_, params.url, frame->top()->url(), params.mimeType.utf8(),

&found, &info, &setting, &mime_type));

- if (!found || !info.enabled)

+ if (!found || !webkit::npapi::IsPluginEnabled(info))

return NULL;

scoped_refptr<webkit::ppapi::PluginModule> pepper_module(

@@ -2717,7 +2717,7 @@ WebPlugin* RenderView::createPlugin(WebFrame* frame,

false);

}

- if (!info.enabled)

+ if (!webkit::npapi::IsPluginEnabled(info))

return NULL;

ContentSetting host_setting =