webkit/plugins/npapi/plugin_lib_mac.mm - 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/plugins/npapi/plugin_lib_mac.mm

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/plugins/npapi/plugin_lib_mac.mm

diff --git a/webkit/plugins/npapi/plugin_lib_mac.mm b/webkit/plugins/npapi/plugin_lib_mac.mm

index 6e3a22a441c5d8cfc14c911d6eec5c2821c57901..f80e8f20aa76e1479891fe5281a471fcaad4e827 100644

--- a/webkit/plugins/npapi/plugin_lib_mac.mm

+++ b/webkit/plugins/npapi/plugin_lib_mac.mm

@@ -129,7 +129,7 @@ bool ReadPlistPluginInfo(const FilePath& filename, CFBundleRef bundle,

info->desc = base::SysNSStringToUTF16(plugin_desc);

else

info->desc = UTF8ToUTF16(filename.BaseName().value());

- info->enabled = true;

+ info->enabled = WebPluginInfo::USER_ENABLED;

return true;

}

@@ -223,7 +223,7 @@ bool ReadSTRPluginInfo(const FilePath& filename, CFBundleRef bundle,

info->desc = UTF8ToUTF16(plugin_descs[0]);

else

info->desc = UTF8ToUTF16(filename.BaseName().value());

- info->enabled = true;

+ info->enabled = WebPluginInfo::USER_ENABLED;

return true;

}