chrome/browser/renderer_host/buffered_resource_handler.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/browser/renderer_host/buffered_resource_handler.cc

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

Patch Set: Forgotten to upload the mergeconflict resolutions (trybots happiness aplies to this upload). 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/browser/renderer_host/buffered_resource_handler.cc

diff --git a/chrome/browser/renderer_host/buffered_resource_handler.cc b/chrome/browser/renderer_host/buffered_resource_handler.cc

index 2cccbc2857813f663766d125cfdc28b5de7885a4..05aa75fdc08b0abfa3131ca4844d64490267bd12 100644

--- a/chrome/browser/renderer_host/buffered_resource_handler.cc

+++ b/chrome/browser/renderer_host/buffered_resource_handler.cc

@@ -434,7 +434,8 @@ bool BufferedResourceHandler::ShouldDownload(bool* need_plugin_list) {

webkit::npapi::WebPluginInfo info;

bool allow_wildcard = false;

return !webkit::npapi::PluginList::Singleton()->GetPluginInfo(

- GURL(), type, allow_wildcard, &info, NULL) || !info.enabled;

+ GURL(), type, allow_wildcard, &info, NULL) ||

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

}

void BufferedResourceHandler::UseAlternateResourceHandler(