webkit/tools/test_shell/test_webview_delegate.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: webkit/tools/test_shell/test_webview_delegate.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: webkit/tools/test_shell/test_webview_delegate.cc

diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc

index f16b9aa52557a462924099c5b05b334fd7d10806..449c746349c613f0a82c4e9a6d1c9f23caaf8b3b 100644

--- a/webkit/tools/test_shell/test_webview_delegate.cc

+++ b/webkit/tools/test_shell/test_webview_delegate.cc

@@ -711,7 +711,7 @@ WebPlugin* TestWebViewDelegate::createPlugin(WebFrame* frame,

std::string actual_mime_type;

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

params.url, params.mimeType.utf8(), allow_wildcard, &info,

- &actual_mime_type) || !info.enabled)

+ &actual_mime_type) || !webkit::npapi::IsPluginEnabled(info))

return NULL;

return new webkit::npapi::WebPluginImpl(