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

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

Patch Set: More fixes and cleanups. Created 10 years 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_shell.cc

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

index 280be89ba8e72cfcf814f6d86f5289937b2f6319..e2d0cfa10850b3f0cadcb822920f140b0d85fc95 100644

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

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

@@ -912,7 +912,8 @@ void GetPlugins(bool refresh, std::vector<WebPluginInfo>* plugins) {

WebPluginInfo plugin_info = plugins->at(i);

for (size_t j = 0; j < arraysize(kPluginBlackList); ++j) {

if (plugin_info.path.BaseName() == FilePath(kPluginBlackList[j])) {

- NPAPI::PluginList::Singleton()->DisablePlugin(plugin_info.path);

+ NPAPI::PluginList::Singleton()->DisablePlugin(plugin_info.path,

+ plugin_info.name);

plugins->erase(plugins->begin() + i);

}