webkit/plugins/npapi/plugin_list_mac.mm - Issue 7901015: Revert 101269 - Store plug-in enabled/disabled state in PluginPrefs instead of WebPluginInfo, to ...

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_list_mac.mm

Issue 7901015: Revert 101269 - Store plug-in enabled/disabled state in PluginPrefs instead of WebPluginInfo, to ... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 9 years, 3 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:

View side-by-side diff with in-line comments

Download patch

Index: webkit/plugins/npapi/plugin_list_mac.mm

===================================================================

--- webkit/plugins/npapi/plugin_list_mac.mm (revision 101271)

+++ webkit/plugins/npapi/plugin_list_mac.mm (working copy)

@@ -107,7 +107,7 @@

// encounter earlier must override plugins we encounter later)

for (size_t i = 0; i < plugin_groups->size(); ++i) {

const std::vector<WebPluginInfo>& plugins =

- (*plugin_groups)[i]->web_plugin_infos();

+ (*plugin_groups)[i]->web_plugins_info();

for (size_t j = 0; j < plugins.size(); ++j) {

if (plugins[j].path.BaseName() == info.path.BaseName()) {

return false; // Already have a loaded plugin higher in the hierarchy.

Property changes on: webkit/plugins/npapi/plugin_list_mac.mm

___________________________________________________________________

Added: svn:mergeinfo

Merged /branches/chrome_webkit_merge_branch/src/webkit/plugins/npapi/plugin_list_mac.mm:r3734-4217,4606-5108,5177-5263

« no previous file with comments | « webkit/plugins/npapi/plugin_list.cc ('k') | webkit/plugins/npapi/plugin_list_posix.cc » ('j') | no next file with comments »