| Index: webkit/plugins/npapi/plugin_lib_mac.mm
|
| ===================================================================
|
| --- webkit/plugins/npapi/plugin_lib_mac.mm (revision 101271)
|
| +++ webkit/plugins/npapi/plugin_lib_mac.mm (working copy)
|
| @@ -125,6 +125,7 @@
|
| info->desc = base::SysNSStringToUTF16(plugin_desc);
|
| else
|
| info->desc = UTF8ToUTF16(filename.BaseName().value());
|
| + info->enabled = WebPluginInfo::USER_ENABLED;
|
|
|
| return true;
|
| }
|
|
|
| Property changes on: webkit/plugins/npapi/plugin_lib_mac.mm
|
| ___________________________________________________________________
|
| Added: svn:mergeinfo
|
| Merged /branches/chrome_webkit_merge_branch/src/webkit/plugins/npapi/plugin_lib_mac.mm:r3734-4217,4606-5108,5177-5263
|
|
|
|
|