| Index: webkit/plugins/npapi/plugin_lib_posix.cc
|
| ===================================================================
|
| --- webkit/plugins/npapi/plugin_lib_posix.cc (revision 101271)
|
| +++ webkit/plugins/npapi/plugin_lib_posix.cc (working copy)
|
| @@ -162,6 +162,7 @@
|
| }
|
|
|
| info->path = filename;
|
| + info->enabled = WebPluginInfo::USER_ENABLED;
|
|
|
| // Attempt to swap in the wrapped plugin if this is nspluginwrapper.
|
| UnwrapNSPluginWrapper(&dl, &info->path);
|
|
|
| Property changes on: webkit/plugins/npapi/plugin_lib_posix.cc
|
| ___________________________________________________________________
|
| Added: svn:mergeinfo
|
| Merged /branches/chrome_webkit_merge_branch/src/webkit/plugins/npapi/plugin_lib_posix.cc:r3734-4217,4606-5108,5177-5263
|
|
|
|
|