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

diff --git a/chrome/browser/plugin_data_remover.cc b/chrome/browser/plugin_data_remover.cc

index 89e0ecec103a09bacda4cdeb424caa581bdbdc41..a9d9c9d1f8c70d5b8ebe700067eca9d3c42b66cc 100644

--- a/chrome/browser/plugin_data_remover.cc

+++ b/chrome/browser/plugin_data_remover.cc

@@ -176,7 +176,7 @@ bool PluginDataRemover::IsSupported() {

switches::kMinClearSiteDataFlashVersion)));

if (!min_version.get())

min_version.reset(Version::GetVersionFromString(kMinFlashVersion));

- return plugin.enabled &&

+ return webkit::npapi::IsPluginEnabled(plugin) &&

version.get() &&

min_version->CompareTo(*version) == -1;

}