chrome/browser/plugins/plugin_finder.cc - Issue 11066043: Block NPAPI plug-ins in Metro mode instead of not loading them at all.

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/plugins/plugin_finder.cc

Issue 11066043: Block NPAPI plug-ins in Metro mode instead of not loading them at all. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: sync Created 8 years, 2 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/plugins/plugin_finder.cc

diff --git a/chrome/browser/plugins/plugin_finder.cc b/chrome/browser/plugins/plugin_finder.cc

index 4e64c5017a0d59af49de7edd2b72180699f83747..057f140716ef78a60a0fd22eba8a69956e80f897 100644

--- a/chrome/browser/plugins/plugin_finder.cc

+++ b/chrome/browser/plugins/plugin_finder.cc

@@ -225,7 +225,8 @@ bool PluginFinder::FindPluginWithIdentifier(

std::map<std::string, PluginInstaller*>::const_iterator it =

installers_.find(identifier);

if (it != installers_.end()) {

- *installer = it->second;

+ if (installer)

+ *installer = it->second;

PluginMap::const_iterator metadata_it = identifier_plugin_.find(identifier);

DCHECK(metadata_it != identifier_plugin_.end());

*plugin_metadata = metadata_it->second->Clone();